99b9e36eb0
Remove plugin root from filesystem.
...
`docker plugin remove` didnt actually remove plugin from disk. Fix that.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 5690730a7471726bbaf813e634a7117a562dfb8c
Component: engine
2016-08-01 10:46:50 -07:00
3cd473134d
Merge pull request #24760 from anusha-ragunathan/plugin-events
...
Make daemon events listen for plugin lifecycle events.
Upstream-commit: 297745b1cdfb79a12986465f8150e22b0018c640
Component: engine
2016-07-27 13:36:49 -07:00
e696a8fadd
Merge pull request #25131 from mavenugo/restoreln
...
Vendoring libnetwork to fix #25109
Upstream-commit: b90f6d780a4b24bcd877505d177593dd5af8107d
Component: engine
2016-07-27 11:09:27 -07:00
6c0a8ccd7a
update rolling update tutorial to reflect default parallelism and update on failure
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 6440cacd49226e97b2dcb64eb31cb32b87b1ff18
Component: engine
2016-07-27 09:36:05 -07:00
156db134e4
Merge pull request #25111 from coolljt0725/fix_25110
...
Fix daemon panic on restoring containers
Upstream-commit: abf0e9f071c878ed33e84ca5c3cc1fc866f30652
Component: engine
2016-07-27 11:43:45 -04:00
62baa45d6c
Vendoring libnetwork to fix #25109
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: b1ae883d3f8c35f9142966af7bf5278e7a10b268
Component: engine
2016-07-27 08:41:46 -07:00
cb9f5d85ea
Merge pull request #25067 from lixiaobing10051267/masterBreak
...
Add break after found = true
Upstream-commit: 2c947a4b009f90ce79abbdf137ea908320ab28ec
Component: engine
2016-07-27 14:44:13 +02:00
69eee2ec52
Merge pull request #25120 from thaJeztah/put-back-1.12-links
...
Add back links to 1.12 release in deprecated.md
Upstream-commit: 296378d575f8111ba4a831c2d03baa21ed30582d
Component: engine
2016-07-27 21:48:10 +10:00
cb17293750
Merge pull request #25119 from thaJeztah/pre-1.12-ga-fixes
...
Remove release-candidate advisories
Upstream-commit: 415ef83e02a11a086128d2247e09c72e22a09406
Component: engine
2016-07-27 21:43:37 +10:00
49967c7276
Merge pull request #25104 from cpuguy83/fix_TestApiSwarmRaftQuorum
...
fix race in TestApiSwarmRaftQuorum
Upstream-commit: e07ff10f706a5bb9aa403c8d56876b09f9cba857
Component: engine
2016-07-27 12:50:09 +02:00
ce6c596db3
Merge pull request #25107 from stevvooe/cleanup-leader-election-test
...
integration-cli: cleanup leader election tests
Upstream-commit: ef63637b995b07a08b6cb326dc8953b927e9df1d
Component: engine
2016-07-27 12:47:33 +02:00
619c13b7c9
Merge pull request #25057 from lixiaobing10051267/masterTestChtimes
...
Modify func name from TestChtimes to TestChtimesLinux
Upstream-commit: 6857c0a040cc3aabadd0dbf2a1a517ddc3d02fc8
Component: engine
2016-07-27 11:58:04 +02:00
05b77e523d
Merge pull request #25071 from yongtang/07252016-docs-bundlefile-example
...
Add a bundlefile example in the documentation
Upstream-commit: 468ca5bb087a5bc91f5337450554a4692ed02329
Component: engine
2016-07-27 11:56:38 +02:00
4fdbca5a16
Merge pull request #25080 from crosbymichael/build-directive
...
Move directive out of globals
Upstream-commit: ffd96a7c733983a14edbb72b8a8685b7fb0102b6
Component: engine
2016-07-27 11:35:25 +02:00
ef4baa67b4
Add back links to 1.12 release in deprecated.md
...
These links were temporarily changed, because the
docs were published before the 1.12.0 tag was
available.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cd69b94241b94d16ac6dfad6e6bc7fc981dc2cca
Component: engine
2016-07-27 11:30:42 +02:00
07a9303505
Remove release-candidate advisories
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 053ac127ab0f784bebeda38f29f2d7615d2ffcb8
Component: engine
2016-07-27 11:24:16 +02:00
669220f611
fix minor docs issues
...
this brings back the trailing whitespace in "runmetrics",
that were there intentially to force a line-break
also removes a duplicate redirect, that was present
on two pages
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d8434eba462752327d4c7769d3ce2c85013c211e
Component: engine
2016-07-27 11:09:57 +02:00
b404d167d7
Merge pull request #24970 from sfsmithcha/daemonless_containers
...
add doc for live-restore setting and daemonless containers, fix admin…
Upstream-commit: d8c9fd0af9be3e937ec0520e0dcbe9a80eb321c4
Component: engine
2016-07-27 11:00:15 +02:00
b8668fb50c
Merge pull request #24955 from sfsmithcha/add_how_services_work
...
add how services work to how swarm mode works guide
Upstream-commit: 59e341667fdf24f8de7af7337dceea196d816457
Component: engine
2016-07-27 10:59:08 +02:00
e4e65a85a5
Fix daemon panic on restoring containers
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c75de8e33cc0db5236eef6146f2de06533b46aa8
Component: engine
2016-07-26 22:52:52 -04:00
fbd6f3276f
Merge pull request #25085 from aaronlehmann/restart-delay-integration-tests
...
Specify a lower restart delay for swarm integration tests
Upstream-commit: 5d65ba4ca7ecaaa31f13cd3052ac7c052f09e21f
Component: engine
2016-07-26 22:18:28 -04:00
6a74120b2c
Merge pull request #25084 from yongtang/25029-flaky-TestSwarmNodeTaskListFilter
...
Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed
Upstream-commit: ebeee32b4e22fd86e2d27edbe3c7ab8a39e3a402
Component: engine
2016-07-26 22:16:54 -04:00
9f01f14280
integration-cli: cleanup leader election tests
...
Ensure convergence before moving on with testing leader election
conditions. This reduce the flakiness of this test when run in different
environments.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 946e23776be78510799f3f242f7b9f7acbbfd357
Component: engine
2016-07-26 19:12:27 -07:00
e9800c4e43
Modify func name from TestChtimes to TestChtimesLinux
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Modify func note
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 1df9f0932e50ae497a6c79fc3a0ee85cb67f60d4
Component: engine
2016-07-27 10:05:59 +08:00
025360735d
fix race in TestApiSwarmRaftQuorum
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4a856d7a87c65dd8c537a45443c72698f056cf13
Component: engine
2016-07-26 21:32:56 -04:00
0a12b515a3
Merge pull request #25086 from dmcgowan/overlay2-fix-sub-directory-whiteouts
...
Fix overlay2 sub directory whiteouts
Upstream-commit: bb27d017f395d5683d0f82a203038c3055be91d8
Component: engine
2016-07-26 20:45:41 -04:00
774dbb0332
Merge pull request #25053 from AkihiroSuda/fixPluginPanic
...
Fix pkg/plugins TLSConfig panic
Upstream-commit: 646f04799c031ee16e14103c893183a5b50d82db
Component: engine
2016-07-26 16:49:49 -07:00
08e3e00d23
Remove the Require on the socket for the rpm
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 3cddda3bbb0cbc6f600b228b61e1110e0cf34c65
Component: engine
2016-07-26 14:56:27 -07:00
e1f945a9c5
Merge pull request #25083 from mapk0y/fix-doc-ipaddress
...
fixes the ipaddress of the explanation.
Upstream-commit: 3b8ef038c10e0dbf624b44498d8832d0e189ed71
Component: engine
2016-07-26 16:07:51 -04:00
2d9c640d4f
Specify a lower restart delay for swarm integration tests
...
If no restart delay is specified for a swarm service, the default
restart delay is 5 seconds. This is a reasonable value for actual
deployments - one example of where it's useful is that if a bad image is
specified, the orchestrator will wait 5 seconds between attempts to
restart it instead of restarting it in a tight loop.
In integration tests, this 5 second delay is dead time. The tests run
faster if the delay is reduced. Set it to 100 ms to avoid the waste of
time.
This appears to speed up a few tests:
DockerSwarmSuite.TestApiSwarmForceNewCluster 37.241s -> 34.323s
DockerSwarmSuite.TestApiSwarmRestartCluster 22.038s -> 15.545s
DockerSwarmSuite.TestApiSwarmServicesMultipleAgents 24.456s -> 19.853s
DockerSwarmSuite.TestApiSwarmServicesStateReporting 19.240s -> 10.049s
...a small step towards making the Swarm integration tests run in a
reasonable amount of time.
Also, change the update delay for the rolling update test from 8 seconds
to 4 seconds, which should be sufficient to differentiate between
batches of updated tasks. This reduces the runtime for
DockerSwarmSuite.TestApiSwarmServicesUpdate from 28s to 20s.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c93c6492589504ed9474922f7c98f9ecb24df77f
Component: engine
2016-07-26 12:12:43 -07:00
5b655758f7
Fix files in subdirectories creating bad whiteout
...
Closes #23863
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 1c0f6653ba82c933885719478e90c13f8d7e32b7
Component: engine
2016-07-26 12:03:55 -07:00
8ab2988832
Update diff apply test to check sub directories
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 5c05b8447d06793530e3d860b99a6e878685275a
Component: engine
2016-07-26 12:03:55 -07:00
1fe61aeefa
Fix flaky TestSwarmNodeTaskListFilter by waiting for task fully deployed
...
This is an attempt to fix the flaky test of TestSwarmNodeTaskListFilter in 25029.
Basically this fix adds a check to wait until 3 containers has already up,
before processing `node tasks ...`.
This might fix 25029.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 63c0366bc9a7f326ad61cdfa69fa860cf844a2c7
Component: engine
2016-07-26 11:56:58 -07:00
4695440d40
Merge pull request #25076 from sfsmithcha/add_manage_nodes_guide
...
author merge: add swarm manage nodes guide
Upstream-commit: 08d1995fbf166cf5d6a0db5f37a11af8d28ee9f3
Component: engine
2016-07-26 11:33:46 -07:00
3bf48fb858
fix the ipaddress of an explanation.
...
Signed-off-by: mapk0y <mapk0y@gmail.com >
Upstream-commit: a94b48923e8ec7a5e9ebe6101f0ccac208fb4f25
Component: engine
2016-07-27 03:17:32 +09:00
062b507351
Make daemon events listen for plugin lifecycle events.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 42abccb841b5bc0d420044e69165852b0054c38f
Component: engine
2016-07-26 10:51:47 -07:00
305bc09342
add how services work to how swarm mode works guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: bef36fba4022e1c37f1f21e9e265e7f98e2f7f65
Component: engine
2016-07-26 10:44:19 -07:00
16a63d94bb
Move directive out of globals
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 755be795b4e48b3eadcdf1427bf9731b0e97bed1
Component: engine
2016-07-26 10:35:33 -07:00
faa1d07424
add swarm manage nodes guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 704facbbab0af520e0429eb75a6f875b6015a77c
Component: engine
2016-07-26 10:25:05 -07:00
cc030158a5
Merge pull request #25068 from cpuguy83/fix_test_parse_words
...
Fix issue with test ordering for TestParseWords
Upstream-commit: 4e3d6e36a633350adf638ca29ae5ac7d1cd0f2ec
Component: engine
2016-07-26 18:27:54 +02:00
3c909576f6
Merge pull request #25033 from anusha-ragunathan/plugin-restart
...
Check for plugin state before enabling plugin.
Upstream-commit: 3c4d3b2cacdd263ccded0ed0639c22fad96550d6
Component: engine
2016-07-26 18:24:02 +02:00
c402160cdb
Add break after found = true
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 8928677ea2b4e69ecfd96a2c951a33e46b7b7388
Component: engine
2016-07-26 23:28:44 +08:00
f4ad386d76
Fix issue with test ordering for TestParseWords
...
`TestParseWords` needs to use the `tokenEscape` for one of the test
cases, but `tokenEscape` was not being set unless tests ran in a
specific order.
This sets a default value for `tokenEscape`... `\`... so that tests that
rely on this global are not affected by test ordering.
This is the simplest fix for these cases. Ideally the token should not
be set as a global but rather passed down, which is a much larger
change.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: df167d3ff04cdc90012c8ca39647662ad69e6715
Component: engine
2016-07-26 10:50:12 -04:00
7a976a60f2
Merge pull request #24950 from dnephin/make-manpages-in-container
...
Make manpages in a container when creating deb/rpm
Upstream-commit: 1e83886dd52f92e8ea738b33ec6ec6bd992c1263
Component: engine
2016-07-26 14:34:14 +02:00
ed486e4e8a
Merge pull request #25060 from albers/completion-swarm-inspect
...
Remove bash completion for `docker swarm inspect`
Upstream-commit: 00295c4bb3e1399d3e0edd89a1ae52c1bcf2e28e
Component: engine
2016-07-26 13:56:11 +02:00
6b65af2d20
Remove bash completion for docker swarm inspect
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 34d9a8240914d30f3a8fe28c1b7d1d4e36d0657b
Component: engine
2016-07-26 04:51:27 -07:00
6776aff799
bash completion for container labels to service {create,update}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 13c138ec2a896a87da8fa81693975e7ffbec85fd
Component: engine
2016-07-26 04:45:57 -07:00
ce5e5d9c75
Merge pull request #25051 from dmcgowan/fix-untag-without-force-while-container-running
...
Fix untag without force while container running
Upstream-commit: bad654b00c954e31007c5004629e236c06ca4046
Component: engine
2016-07-26 02:12:10 -07:00
ac18bf29a1
Fix pkg/plugins TLSConfig panic
...
Fix #25046
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: b1e71bdd1d624e297509a62b072082524dc841fc
Component: engine
2016-07-26 08:53:54 +00:00
688b7fe3c1
Merge pull request #25050 from aaronlehmann/vendor-swarmkit-rc5
...
Vendor swarmkit for 1.12.0-rc5
Upstream-commit: 9fc2eee2b5b3c0cbc392a7ce6c085984871fb770
Component: engine
2016-07-26 01:47:34 -07:00
