Arnaud Porterie
b0143169a4
Merge pull request #23531 from tonistiigi/rm-race
...
Fix race on force deleting container created by task
Upstream-commit: bd92dd29b9436f4e6a16904e92ce2d965e994d2c
Component: engine
2016-06-15 02:33:56 +00:00
Arnaud Porterie
955da7c9c3
Merge pull request #23524 from aboch/restore
...
Daemon to support network restore
Upstream-commit: 91197953d07843e34f02d6d2dc435cc4c43dfec1
Component: engine
2016-06-15 02:33:16 +00:00
Arnaud Porterie
50a4204953
Merge pull request #23551 from tonistiigi/update-swarmkit
...
Update swarmkit to 25572005f
Upstream-commit: 574f7d2149930749256d075e2f60614ea97c85ae
Component: engine
2016-06-15 02:25:31 +00:00
Arnaud Porterie
d191ef8662
Merge pull request #23522 from docker/swarm-stack
...
Add experimental Docker Stack CLI commands
Upstream-commit: c0677565dc99c67edea0e109e86a7a3dbaca28ac
Component: engine
2016-06-15 02:22:01 +00:00
Tõnis Tiigi
4ac77af3db
Merge pull request #23552 from vieux/prevent_panics
...
prevent some panics in 'service update'
Upstream-commit: aa1b507af6a0c17ea35301d911109db1bb88dd7d
Component: engine
2016-06-14 19:08:46 -07:00
Arnaud Porterie
a1a5b6649c
Merge pull request #23548 from vieux/no_more_reject
...
no more 'docker node reject' in docs
Upstream-commit: e087ba4633c948f00ca3d92c9906fc4cc5db06db
Component: engine
2016-06-15 00:43:58 +00:00
Michael Crosby
668da7d95d
Merge pull request #23530 from crosbymichael/exp-tests
...
Kill containers after restart tests
Upstream-commit: cd03a68d31b33f0020a838bda25c0135f11479e3
Component: engine
2016-06-14 17:43:52 -07:00
Brian Goff
3c08c9d8dd
Merge pull request #23446 from tiborvass/plugins-experimental
...
Plugins: experimental support for new plugin management
Upstream-commit: 6ed921dc38be582939966f71a01ec10f03ed531f
Component: engine
2016-06-14 20:32:14 -04:00
Tonis Tiigi
db7d3c4eb4
Update drain test
...
With the rolling update there can be a possibility
that the container count matches the update has
completely finished yet.
The actual bug for the flakiness was fixed with the
swarmkit update.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: b38408fd0287a5d6eda4f8083b83806faf5d5cbd
Component: engine
2016-06-14 17:25:17 -07:00
Tonis Tiigi
a7a6c7f5a8
Update daemon to new swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 25a89d73e57e46dd23caebcb6446c7edd6e07f56
Component: engine
2016-06-14 17:23:35 -07:00
Tonis Tiigi
d1fb87c721
Update swarmkit to 25572005f
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: cdf279d74df05b2ce2a051fc5b53533ac5249f16
Component: engine
2016-06-14 17:07:14 -07:00
Tibor Vass
636f39c7bd
Merge pull request #23546 from sfsmithcha/formatting_updates_and_revisions
...
update formatting for variables, clarify text in certain topics
Upstream-commit: 93daa10e3ed326ce01cd18904824b0406fe86eb1
Component: engine
2016-06-14 17:04:59 -07:00
Tibor Vass
b431a2061e
Merge pull request #23547 from icecrime/update_api_reference
...
Update API reference
Upstream-commit: 381a15279374b482a8257ee277488ae562cf61a1
Component: engine
2016-06-14 17:04:34 -07:00
Tonis Tiigi
08261c5b09
Fix race on force deleting container created by task
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: dcfe99278db113e79dc037a6f854f4cea9eebe22
Component: engine
2016-06-14 16:49:04 -07:00
Lei Jitang
dc06e7fb83
Add test case for network restore
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 7d0689a8d35e4dd7d569e552957a20ba287c95e6
Component: engine
2016-06-14 16:45:30 -07:00
Lei Jitang
a05c8dd297
Daemon to support network restore
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: ecffb6d58cf89371e3f4a20f55c2e614dbdfe880
Component: engine
2016-06-14 16:45:25 -07:00
Arnaud Porterie (icecrime)
954ba685a5
Update API reference
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 98880d8b3938a5cb1b5d7970cbb8efb849a9f97d
Component: engine
2016-06-14 16:41:10 -07:00
Charles Smith
31529f7e86
update formatting for variables, clarify text in certain topics
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 7b0c3066e30d721fb9efbac74e9675e1baeb019a
Component: engine
2016-06-14 16:35:40 -07:00
Michael Crosby
be376bb788
Kill containers after restart tests
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: e07d78d247c796236e92faed6cfbe05177691d95
Component: engine
2016-06-14 16:17:36 -07:00
Michael Crosby
1d9578a788
Merge pull request #23535 from dmcgowan/cleanup-symlinks-overlay2
...
Remove symlinks on layer removal for overlay2
Upstream-commit: 8a6cb9c19f5080cbaccdfc1af72ca29b1a715ae5
Component: engine
2016-06-14 16:08:34 -07:00
Sebastiaan van Stijn
7f8d0e6d4a
Merge pull request #23476 from mgoelzer/docker112_bash_completions
...
Bash tab completions for subcommands swarm, service and node
Upstream-commit: 93ef595eb5d1bf0a0abf062ad921ac318d20d720
Component: engine
2016-06-15 00:55:40 +02:00
Sebastiaan van Stijn
ac4f3c4188
docker plugin commandline reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e79873c27c2b3f404db02682bb4f11b5a046602e
Component: engine
2016-06-14 15:50:00 -07:00
Michael Crosby
d3cd4d14aa
Merge pull request #23415 from aboch/ll
...
Allow user to specify container's link-local addresses
Upstream-commit: c97fdbe3c5954b2685a8b140f595f06b09191956
Component: engine
2016-06-14 15:47:54 -07:00
Arnaud Porterie
237e46e585
Merge pull request #23525 from dnephin/fix_service_update_repliacs
...
Fix service update replicas
Upstream-commit: a0e992eff7055e1300fdcdf955c109a9904b0e1d
Component: engine
2016-06-14 22:41:08 +00:00
Victor Vieux
898d7aa097
prevent some panics in 'service update'
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 1d380243fcfaab2f4f82fa594e25aae3626ec03d
Component: engine
2016-06-14 15:37:27 -07:00
Michael Crosby
a0e666c042
Merge pull request #23540 from cpuguy83/fix_test_cleanup_mounts
...
TestCleanupMountsAfterGracefulShutdown wait for daemon exit
Upstream-commit: 3f0dbc89b8d27238544c9a0ea9aaafd7a2731206
Component: engine
2016-06-14 15:34:21 -07:00
Arnaud Porterie (icecrime)
76d4651592
Add experimental documentation for stacks
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: ae816baa3c36aaec5e3b7c31425b620b4709ab50
Component: engine
2016-06-14 15:31:45 -07:00
Alexander Morozov
896826cadf
docs: move sysctls docs to current API version
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: de22669377d074a2594de33be01ae4d9723283a8
Component: engine
2016-06-14 15:14:16 -07:00
Victor Vieux
60c51154d7
no more 'docker node reject' in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c21f8613275ca546b1310999d8714ff2609f33e3
Component: engine
2016-06-14 14:55:25 -07:00
Alessandro Boch
6c19b5ff61
Allow user to specify container's link-local addresses
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 1c4efb6aa05026efce99a7a5bb7e710c0f1b3002
Component: engine
2016-06-14 14:28:33 -07:00
Tibor Vass
848e510213
plugins: experimental support for new plugin management
...
This patch introduces a new experimental engine-level plugin management
with a new API and command line. Plugins can be distributed via a Docker
registry, and their lifecycle is managed by the engine.
This makes plugins a first-class construct.
For more background, have a look at issue #20363 .
Documentation is in a separate commit. If you want to understand how the
new plugin system works, you can start by reading the documentation.
Note: backwards compatibility with existing plugins is maintained,
albeit they won't benefit from the advantages of the new system.
Signed-off-by: Tibor Vass <tibor@docker.com >
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: f37117045c5398fd3dca8016ea8ca0cb47e7312b
Component: engine
2016-06-14 14:20:27 -07:00
Tibor Vass
cee3d77054
plugins: vendor engine-api to import new plugin types
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e5b7d36e9954ffd8c199c0fcfaa0b9f4bfdeb196
Component: engine
2016-06-14 14:20:27 -07:00
Brian Goff
3fcf0ea4c7
TestCleanupMountsAfterGracefulShutdown wait for daemon exit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9c52b11e2a92a2c5f78d18ae95ba8d79b149d9e2
Component: engine
2016-06-14 17:14:53 -04:00
Alessandro Boch
d44cc26f44
Vendoring libnetwork 452dff1
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5b79122146008e21a01419953bab2d905c94568d
Component: engine
2016-06-14 13:45:24 -07:00
Daniel Nephin
6d0da8f64f
Use constants for flag names.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1b2c59bf86a67f7238df07b860234b02478f7371
Component: engine
2016-06-14 16:43:56 -04:00
Mike Goelzer
c6289ff5b6
Update bash completion for Docker 1.12 CLI commands
...
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com >
Upstream-commit: 35e2970b984971465b107aec1e6f2e9c274183f4
Component: engine
2016-06-14 12:57:40 -07:00
Derek McGowan
2ebabdf47f
Remove symlinks on layer removal for overlay2
...
Symlinks are currently not getting cleaned up when removing layers since only the root directory is removed.
On remove, read the link file and remove the associated link from the link directory.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: e6f2e7646c813e8225b0bc16d3a0c13c76a9cd97
Component: engine
2016-06-14 12:40:35 -07:00
Daniel Nephin
4bf224e6e8
Remove CmdTag.
...
This file was accidentally re-added as part of a rebase.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 19d6960b5bab7598b15091e5d9e9ee3b24537511
Component: engine
2016-06-14 15:09:38 -04:00
Michael Crosby
9dddec0b2c
Merge pull request #22983 from mlaventure/multiple-runtimes
...
Add support for multiple runtimes
Upstream-commit: 6381ed14d13b57873eb985380e52c9ff4fd94b98
Component: engine
2016-06-14 11:59:34 -07:00
Daniel Nephin
a4f6628660
Add experimental docker stack commands
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 71104bb592dc98467d3828394eabcbe50ca22ae4
Component: engine
2016-06-14 14:56:35 -04:00
Brian Goff
7636cd663b
Merge pull request #23523 from vieux/fix_mounts_swarm
...
fix 2 potential panics with mounts in swarm
Upstream-commit: 87f31e379d7440bc3d0896a7b964e4ed59b6249a
Component: engine
2016-06-14 14:44:19 -04:00
Tibor Vass
8a4b73bd5c
Merge pull request #23526 from tonistiigi/skip-drain-test
...
Temporarily skip flaky part of the drain test
Upstream-commit: f0e89526698de9bc7b081a91c0cfb8390326a0cb
Component: engine
2016-06-14 10:56:03 -07:00
Tonis Tiigi
fd56910b10
Increase the join connect timeout
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 499e3a45b17eff6d52abe6ba9063fe365415cf08
Component: engine
2016-06-14 10:20:47 -07:00
Tonis Tiigi
bd9cd01452
Temporarily skip flaky part of the drain test
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 32f18616c70c52298ea7e07529acba852aa87c86
Component: engine
2016-06-14 10:20:40 -07:00
Victor Vieux
9371e0d883
fix 2 potential panics with mounts in swarm
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: ffeb9fcb2a155f3495be333f9c6df41ea14c809b
Component: engine
2016-06-14 09:25:39 -07:00
Vincent Demeester
4de05c442d
Migrate cp command to cobra
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2e6db51de7dc293785520df81c6bb54aa96c84ca
Component: engine
2016-06-14 17:16:59 +02:00
Kenfe-Mickael Laventure
ac73c8e6d1
Skip TestRunResolvconfUpdate as it is unstable
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 77efe6dffcd337a45831c5294fc402627251e915
Component: engine
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
555a6b9040
Vendor in new runc binary with userns fix
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 1aec3bacfd754e1ed72ec5a59dfd20d653f794a3
Component: engine
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
b0f26257f3
Fix race in DockerExternalGraphdriverSuite.TestExternalGraphDriver
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 1f266d40f3844d1e398186cb98b4deb2272ebd6c
Component: engine
2016-06-14 07:47:31 -07:00
Kenfe-Mickael Laventure
c95e7259f3
Add bash completion support for --runtime and --add-runtime
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 6e9bf4d3167c19bed0b8136d38bc1fe9146a45e5
Component: engine
2016-06-14 07:47:31 -07:00