3fac2ae98a
Updated to use correct cgroup paths
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com >
Upstream-commit: b582977bc8a7937a12b9064aa7fbe688b7d9c8fe
Component: engine
2015-08-27 10:39:37 +01:00
cdd3b53574
Merge pull request #15878 from brahmaroutu/vendor_netns
...
Allow vendoring netns changes to build Docker on s390x
Upstream-commit: 4579d5ac783df9d275fb616009cb6754efffe5ec
Component: engine
2015-08-27 10:02:25 +02:00
54ef7aa45d
Merge pull request #15760 from mikebrow/9235-improve-documentation
...
Improvement to userguide/dockerrepos/ documentation
Upstream-commit: 44ea7e91fb1fc3e237ff6c70c2615f8cd919b8ff
Component: engine
2015-08-27 01:21:12 +02:00
4801e8999f
improvement to documentation
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: 5caccd27cd9903786898a336bd28fc50450f9eab
Component: engine
2015-08-26 16:49:31 -05:00
0143ca9eed
Merge pull request #15773 from charleswhchan/patch-3
...
Fix #14572 : Improve explaination for using `RUN` command inside Docke…
Upstream-commit: 5e8038d0b0e4f1af43a0daecc4775375721d1051
Component: engine
2015-08-26 14:19:44 -07:00
248e0595b9
Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion
...
remove btrfs subvolumes when destroying containers (recursive)
Upstream-commit: 459c2c66c3c168364f90532811c96c80e8153822
Component: engine
2015-08-26 14:00:53 -07:00
c09d503a17
Merge pull request #15826 from Microsoft/start-from-one
...
Builder counts from 1
Upstream-commit: 7a74422724ef3a4ae33f6bcd45ce908be279e476
Component: engine
2015-08-26 13:59:38 -07:00
4602da3b1b
Merge pull request #15493 from stevvooe/no-buffer-on-push
...
Avoid buffering to tempfile when pushing with V2
Upstream-commit: 70a814c3f378a5873aedf3be85397272de4f6672
Component: engine
2015-08-26 13:59:01 -07:00
2dc587d949
Merge pull request #15843 from MHBauer/version-order
...
reweight api doc for v1.21 to correct the order.
Upstream-commit: ea65c38ac0972709cdb371ce6b1886eb252a126e
Component: engine
2015-08-26 13:51:06 -07:00
ebcab8fd5d
reweight api doc for v1.21 to correct the order.
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 31a52a31c661fedc671e53c3706bc294f8bf6b1c
Component: engine
2015-08-26 13:40:37 -07:00
20b02657f2
Merge pull request #15865 from Microsoft/10662-isabs
...
Windows: Fix use of IsAbs check
Upstream-commit: 47cdae243a7e0108d487e88cab966ff09e8d94c0
Component: engine
2015-08-26 13:29:24 -07:00
05f2bb7d8b
Merge pull request #14242 from cpuguy83/add_volume_api
...
Add volume api
Upstream-commit: fa13f7cde81d1d92c17740efb05823e7f9cc5468
Component: engine
2015-08-26 21:57:12 +02:00
799fa64220
Windows: Fix use of IsAbs check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f11ba3135b19006a47cf80861f3c291a3211eb1e
Component: engine
2015-08-26 12:38:28 -07:00
bfe1bbc7d2
Add volume API/CLI
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b3b7eb2723461b1eb4be692f4bced0ae8ea9cb58
Component: engine
2015-08-26 13:37:52 -04:00
34f99e4291
Merge pull request #15848 from calavera/revert_ipc_mounts
...
DO NOT MERGE: Check if these commits broke the builds.
Upstream-commit: 5dadfa8b697f83619f4782eb2421c161a779b859
Component: engine
2015-08-26 10:29:25 -07:00
5850f3450f
Builder counts from 1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 17d6c6c7e514d6cea0820c6e81924413e9416cad
Component: engine
2015-08-26 10:05:04 -07:00
addde22b02
Merge pull request #15850 from choleraehyq/15849-fixtypo
...
api/client/restart.go:Fix a typo in comment
Upstream-commit: 7ef08f39eddecdf120af4dd92c2c3128a021523b
Component: engine
2015-08-26 16:10:31 +02:00
c1608c666a
Merge pull request #13304 from coolljt0725/restart_daemon_with_paused_containers
...
Fix restart docker daemon with paused containers
Upstream-commit: 2cec06fbcd0b4cb6107ae432d92c3997075a4035
Component: engine
2015-08-26 09:04:14 -04:00
1a3f9a1f39
api/client/restart.go:Fix a typo in comment
...
Signed-off-by: Yingqian Hu <choleraehyq@gmail.com >
Upstream-commit: d30990d7b1468488768847521a3a7ce66a081015
Component: engine
2015-08-26 18:59:56 +08:00
6dd2b74345
Merge pull request #15711 from monitorjbl/import-commit-message
...
adding message option to the import subcommand
Upstream-commit: b857dadb334fe0660abce4ae73a8b5b5c7f92c33
Component: engine
2015-08-26 11:42:10 +02:00
8c106c9224
Revert "Add support for sharing /dev/shm/ and /dev/mqueue between containers"
...
This reverts commit d88fe447df0e87b3a57f9d08b108b141dd72678c.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 688dd8477e907ca1899c6c2863775b3af2c30174
Component: engine
2015-08-26 05:23:00 -04:00
9f31b0028d
Revert "Modify test to include /dev/shm sharing"
...
This reverts commit 457aeaa2e1bdbb75c5b3bcedacde460920965c2f.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a9378a0ab56ec50c7b3f14942ac1b54e6ea42f59
Component: engine
2015-08-26 05:22:46 -04:00
0c55d594b4
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 >
Upstream-commit: b6621a1b6c79bf3338ad3fa3746e515b797565fa
Component: engine
2015-08-25 21:58:20 -07:00
c3bcf238b1
Merge pull request #15836 from rsmitty/issue-15835
...
Resolves link to introduction to Docker
Upstream-commit: 8720f71b522fd0a7abbd47374b27e11d7f1beb7d
Component: engine
2015-08-26 12:06:29 +10:00
8ce1cf104d
Merge pull request #15831 from yasker/master
...
Update plugins.md
Upstream-commit: 3bc375c6e4eb29dde58d966437bd52d146ce55c9
Component: engine
2015-08-26 12:05:35 +10:00
1646aadf41
Merge pull request #15838 from rsmitty/issue-15837
...
Updates link to the understanding-docker section
Upstream-commit: a0f6ff7d58cd3de10f10aea56670f2f3d4e35e70
Component: engine
2015-08-26 11:53:58 +10:00
db9cfc87e1
Updates link to the understanding-docker section
...
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com >
Upstream-commit: 90be489f4030ececf98499d9afaf0bc60becafae
Component: engine
2015-08-25 14:12:29 -07:00
7f42d6bd03
Resolves link to introduction to Docker
...
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com >
Upstream-commit: 9a71dd2b90c13291de979d968b5f9240e9a4a7aa
Component: engine
2015-08-25 13:54:39 -07:00
eea5abee5b
Merge pull request #15821 from vbatts/tarsum_warning
...
tarsum: add a big fat warning
Upstream-commit: bdba406492ad0fab8efb9a74bcd4836c80a9ebe2
Component: engine
2015-08-25 22:53:04 +02:00
c4be78888c
tarsum: add a big fat warning
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 459451de8b6760034dd4bf7a782b7875441254a5
Component: engine
2015-08-25 16:50:08 -04:00
5b4a0b8a4c
cleanup and fix btrfs subvolume recursion deletion
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: bd06432ba32a6cc555de82e08b125992aaec25fb
Component: engine
2015-08-25 13:00:41 -07:00
104b75b203
Update plugins.md
...
Add Convoy to Docker plugin list.
Signed-off-by: Sheng Yang <sheng.yang@rancher.com >
Upstream-commit: 5f156d8c2587018aa16c621a9a48c919465cf3f0
Component: engine
2015-08-25 12:01:31 -07:00
211c5a7ae6
Merge pull request #15824 from Microsoft/10662-moredocs
...
Windows: Minor doc clarification
Upstream-commit: 7dbb5fafcdfa8d83e131a94009907ff0cf7d019e
Component: engine
2015-08-25 13:30:54 -04:00
434547ed08
Merge pull request #14978 from gesellix/websocket-disable-check-origin
...
skip checkOrigin during websocket handshake
Upstream-commit: e134ccada7fae12271c4169e592b8bf09aff923d
Component: engine
2015-08-25 12:56:30 -04:00
77030d2282
Windows: Minor doc clarification
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 759ed647fbdb026ec91ba8ef84e0fac67b1c73bb
Component: engine
2015-08-25 09:36:51 -07:00
67834e90a3
Merge pull request #15818 from calavera/fix_api_json_examples
...
Fix json examples in the api reference.
Upstream-commit: 78698855ce248fb2fc3f23cba26abee073200e80
Component: engine
2015-08-25 09:22:38 -07:00
300f8e6fef
Allow vendoring netns change to build Docker on s390x
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: eecf6cd48cf7c48f00aa8261cf431c87084161ae
Component: engine
2015-08-25 15:07:17 +00:00
5e196ef2cc
Fix json examples in the api reference.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7296c845b739ae4133e3d02d56cb7e8df29eb020
Component: engine
2015-08-25 10:55:12 -04:00
b498641d47
Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
...
Fix build with resource limit which system not support.
Upstream-commit: 6f8c4480e4f99b08c84d25f1611d6b12ee646066
Component: engine
2015-08-25 16:42:13 +02:00
26c8e31eba
Merge pull request #15804 from epc/epc-2015236
...
Copy edits for typos
Upstream-commit: ee2c476f22a7727815c91a356190fcb3e23c9d6c
Component: engine
2015-08-25 08:04:53 +02:00
cb83c53d63
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
Upstream-commit: cefb72080d8d30a2f53ac6c7ae91d58e42210661
Component: engine
2015-08-24 23:02:44 -04:00
15378abfc2
adding message option to the import subcommand
...
Signed-off-by: Taylor Jones <monitorjbl@gmail.com >
Upstream-commit: 936b2c6afe490b562df4ebea854b116c3b40a9f5
Component: engine
2015-08-25 02:55:04 +00:00
ef9b8937c0
Fix docker daemon restart with paused container.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 9a9724ad5616dc1a29efabe8082bde043c1a2bc9
Component: engine
2015-08-25 09:42:58 +08:00
78b5767538
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 >
Upstream-commit: 349aef06d51a9425f70a877585fe45283366c2c4
Component: engine
2015-08-24 18:08:05 -07:00
322a07231d
Merge pull request #12159 from mrunalp/feature/ipc_share_dev
...
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
Upstream-commit: 903cd2b9e3e2cea8b5ee7c0b74d52ff4a3beafb5
Component: engine
2015-08-24 17:55:03 -07:00
02b562a357
Merge pull request #15702 from LK4D4/fix_events_tests_15
...
Make events test more deterministic in go1.5
Upstream-commit: 562cc6254fbeae24be2cc7ab5b4a608bcb06ac5f
Component: engine
2015-08-24 20:15:09 -04:00
488804ae00
fix 9939: docker does not remove btrfs subvolumes when destroying container
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dea78fc2ce9d7a2cf24b79f8625a06dbd74403a2
Component: engine
2015-08-24 14:52:07 -07:00
69dbe5953f
Merge pull request #15393 from azurezk/exportImage-toplevel
...
change exportImage to top-level func
Upstream-commit: 82e2dec06de63d85db14c954e472deffdd18c5b7
Component: engine
2015-08-24 14:35:55 -07:00
a45c2b3952
Merge pull request #15756 from tonistiigi/15724-remove-nil-contexts
...
Remove nil contexts
Upstream-commit: 25f4f5588e1b862f1f26a2e4edb57807a9affda4
Component: engine
2015-08-24 14:29:48 -07:00
2bf0729522
Merge pull request #14868 from jeffminard-ck/rhel-init-detect-failure
...
Allow RHEL init script to detect daemon start pid failure
Upstream-commit: ebe27cb34ca5e91173b004e2602c99704350eb7c
Component: engine
2015-08-24 14:24:36 -07:00
