20092 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Morozov	459c2c66c3	Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion ... remove btrfs subvolumes when destroying containers (recursive)	2015-08-26 14:00:53 -07:00
Vincent Demeester	c1af0ac082	Add 'ancestor' ps filter for image ... Makes it possible to filter containers by image, using --filter=ancestor=busybox and get all the container running busybox image and image based on busybox (to the bottom). Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2015-08-26 22:59:48 +02:00
Alexander Morozov	7a74422724	Merge pull request #15826 from Microsoft/start-from-one ... Builder counts from 1	2015-08-26 13:59:38 -07:00
Alexander Morozov	70a814c3f3	Merge pull request #15493 from stevvooe/no-buffer-on-push ... Avoid buffering to tempfile when pushing with V2	2015-08-26 13:59:01 -07:00
moxiegirl	ea65c38ac0	Merge pull request #15843 from MHBauer/version-order ... reweight api doc for v1.21 to correct the order.	2015-08-26 13:51:06 -07:00
Morgan Bauer	31a52a31c6	reweight api doc for v1.21 to correct the order. ... Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>	2015-08-26 13:40:37 -07:00
Alexander Morozov	47cdae243a	Merge pull request #15865 from Microsoft/10662-isabs ... Windows: Fix use of IsAbs check	2015-08-26 13:29:24 -07:00
Sebastiaan van Stijn	fa13f7cde8	Merge pull request #14242 from cpuguy83/add_volume_api ... Add volume api	2015-08-26 21:57:12 +02:00
John Howard	f11ba3135b	Windows: Fix use of IsAbs check ... Signed-off-by: John Howard <jhoward@microsoft.com>	2015-08-26 12:38:28 -07:00
Brian Goff	b3b7eb2723	Add volume API/CLI ... Signed-off-by: Brian Goff <cpuguy83@gmail.com>	2015-08-26 13:37:52 -04:00
Jessie Frazelle	5dadfa8b69	Merge pull request #15848 from calavera/revert_ipc_mounts ... DO NOT MERGE: Check if these commits broke the builds.	2015-08-26 10:29:25 -07:00
John Howard	17d6c6c7e5	Builder counts from 1 ... Signed-off-by: John Howard <jhoward@microsoft.com>	2015-08-26 10:05:04 -07:00
David Calavera	7ef08f39ed	Merge pull request #15850 from choleraehyq/15849-fixtypo ... api/client/restart.go:Fix a typo in comment	2015-08-26 16:10:31 +02:00
Brian Goff	2cec06fbcd	Merge pull request #13304 from coolljt0725/restart_daemon_with_paused_containers ... Fix restart docker daemon with paused containers	2015-08-26 09:04:14 -04:00
Cholerae Hu	d30990d7b1	api/client/restart.go:Fix a typo in comment ... Signed-off-by: Yingqian Hu <choleraehyq@gmail.com>	2015-08-26 18:59:56 +08:00
David Calavera	b857dadb33	Merge pull request #15711 from monitorjbl/import-commit-message ... adding message option to the import subcommand	2015-08-26 11:42:10 +02:00
David Calavera	688dd8477e	Revert "Add support for sharing /dev/shm/ and /dev/mqueue between containers" ... This reverts commit d88fe447df. Signed-off-by: David Calavera <david.calavera@gmail.com>	2015-08-26 05:23:00 -04:00
David Calavera	a9378a0ab5	Revert "Modify test to include /dev/shm sharing" ... This reverts commit 457aeaa2e1. Signed-off-by: David Calavera <david.calavera@gmail.com>	2015-08-26 05:22:46 -04:00
Charles Chan	b6621a1b6c	Fix #14572: Improve explaination for usng RUN and apt-get inside Dockerfil. ... Based on example provided by @thaJeztah and @moxiegirl: https://github.com/docker/docker/pull/15773 Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>	2015-08-25 21:58:20 -07:00
Sven Dowideit	8720f71b52	Merge pull request #15836 from rsmitty/issue-15835 ... Resolves link to introduction to Docker	2015-08-26 12:06:29 +10:00
Sven Dowideit	3bc375c6e4	Merge pull request #15831 from yasker/master ... Update plugins.md	2015-08-26 12:05:35 +10:00
Sven Dowideit	a0f6ff7d58	Merge pull request #15838 from rsmitty/issue-15837 ... Updates link to the understanding-docker section	2015-08-26 11:53:58 +10:00
Spencer Smith	90be489f40	Updates link to the understanding-docker section ... Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>	2015-08-25 14:12:29 -07:00
Spencer Smith	9a71dd2b90	Resolves link to introduction to Docker ... Signed-off-by: Spencer Smith <robertspencersmith@gmail.com>	2015-08-25 13:54:39 -07:00
Sebastiaan van Stijn	bdba406492	Merge pull request #15821 from vbatts/tarsum_warning ... tarsum: add a big fat warning	2015-08-25 22:53:04 +02:00
Vincent Batts	459451de8b	tarsum: add a big fat warning ... Signed-off-by: Vincent Batts <vbatts@redhat.com>	2015-08-25 16:50:08 -04:00
John Howard	f950de5754	Windows: Fix docker cp ... Signed-off-by: John Howard <jhoward@microsoft.com>	2015-08-25 13:26:49 -07:00
Jessica Frazelle	bd06432ba3	cleanup and fix btrfs subvolume recursion deletion ... Signed-off-by: Jessica Frazelle <acidburn@docker.com>	2015-08-25 13:00:41 -07:00
Sheng Yang	5f156d8c25	Update plugins.md ... Add Convoy to Docker plugin list. Signed-off-by: Sheng Yang <sheng.yang@rancher.com>	2015-08-25 12:01:31 -07:00
James Turnbull	7dbb5fafcd	Merge pull request #15824 from Microsoft/10662-moredocs ... Windows: Minor doc clarification	2015-08-25 13:30:54 -04:00
William Hubbs	e3772538c0	Fix OpenRC init script ... The shebang for OpenRC init scripts is now #!/sbin/openrc-run, and we can also use the default start and stop functions built into OpenRC. Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>	2015-08-25 12:02:01 -05:00
William Hubbs	1c0c68b18f	Drop execute bit from openrc init script ... Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>	2015-08-25 12:00:54 -05:00
Brian Goff	e134ccada7	Merge pull request #14978 from gesellix/websocket-disable-check-origin ... skip checkOrigin during websocket handshake	2015-08-25 12:56:30 -04:00
John Howard	759ed647fb	Windows: Minor doc clarification ... Signed-off-by: John Howard <jhoward@microsoft.com>	2015-08-25 09:36:51 -07:00
Alexander Morozov	78698855ce	Merge pull request #15818 from calavera/fix_api_json_examples ... Fix json examples in the api reference.	2015-08-25 09:22:38 -07:00
Srini Brahmaroutu	eecf6cd48c	Allow vendoring netns change to build Docker on s390x ... Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>	2015-08-25 15:07:17 +00:00
David Calavera	7296c845b7	Fix json examples in the api reference. ... Signed-off-by: David Calavera <david.calavera@gmail.com>	2015-08-25 10:55:12 -04:00
David Calavera	6f8c4480e4	Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit ... Fix build with resource limit which system not support.	2015-08-25 16:42:13 +02:00
Sebastiaan van Stijn	ee2c476f22	Merge pull request #15804 from epc/epc-2015236 ... Copy edits for typos	2015-08-25 08:04:53 +02:00
Ed Costello	cefb72080d	Copy edits for typos ... Signed-off-by: Ed Costello <epc@epcostello.com>	2015-08-24 23:02:44 -04:00
Taylor Jones	936b2c6afe	adding message option to the import subcommand ... Signed-off-by: Taylor Jones <monitorjbl@gmail.com>	2015-08-25 02:55:04 +00:00
Lei Jitang	9a9724ad56	Fix docker daemon restart with paused container. ... Signed-off-by: Lei Jitang <leijitang@huawei.com>	2015-08-25 09:42:58 +08:00
Stephen J Day	349aef06d5	Avoid buffering to tempfile when pushing with V2 ... The practice of buffering to a tempfile during a pushing contributes massively to slow V2 push performance perception. The protocol was actually designed to avoid precalculation, supporting cut-through data push. This means we can assemble the layer, calculate its digest and push to the remote endpoint, all at the same time. This should increase performance massively on systems with slow disks or IO bottlenecks. Signed-off-by: Stephen J Day <stephen.day@docker.com>	2015-08-24 18:08:05 -07:00
Jessie Frazelle	903cd2b9e3	Merge pull request #12159 from mrunalp/feature/ipc_share_dev ... ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used	2015-08-24 17:55:03 -07:00
Brian Goff	562cc6254f	Merge pull request #15702 from LK4D4/fix_events_tests_15 ... Make events test more deterministic in go1.5	2015-08-24 20:15:09 -04:00
Ma Shimiao	dea78fc2ce	fix 9939: docker does not remove btrfs subvolumes when destroying container ... Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>	2015-08-24 14:52:07 -07:00
Jessie Frazelle	82e2dec06d	Merge pull request #15393 from azurezk/exportImage-toplevel ... change exportImage to top-level func	2015-08-24 14:35:55 -07:00
Jessie Frazelle	25f4f5588e	Merge pull request #15756 from tonistiigi/15724-remove-nil-contexts ... Remove nil contexts	2015-08-24 14:29:48 -07:00
Jessie Frazelle	ebe27cb34c	Merge pull request #14868 from jeffminard-ck/rhel-init-detect-failure ... Allow RHEL init script to detect daemon start pid failure	2015-08-24 14:24:36 -07:00
moxiegirl	0ce37336b3	Merge pull request #15800 from moxiegirl/carry-14503 ... Closes PR #14503 with this carry	2015-08-24 13:22:19 -07:00