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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
e23f5a9f28
Add missing completion for --config-file
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 1a6ed50e1f295714f6e514ec2c6127717b281216
Component: engine
2016-06-14 07:47:31 -07:00
811cef6ca3
Add support for multiples runtimes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7b2e5216b89b4c454d67473f1fa06c52a4624680
Component: engine
2016-06-14 07:47:31 -07:00
14ac7227ab
Update containerd and runc vendoring
...
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2
runc: 85873d917e86676e44ccb80719fcb47a794676a1
runtime-specs: v1.0.0-rc1
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 2e9ea5c194e5fbb83f59e30f8bda5467086598fe
Component: engine
2016-06-14 07:47:31 -07:00
f3176ba51f
Merge pull request #23489 from thaJeztah/fix-indentation
...
API docs cleanup
Upstream-commit: c913dd5f575c877b93a812c8f57dcc212d566b87
Component: engine
2016-06-14 21:49:48 +10:00
b2d3f0c2e7
Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12
...
surfacing Learn by example topics to top level of Docker Engine docs
Upstream-commit: 2a96ac66ea41d206161a6ef022e10d53f99e86ec
Component: engine
2016-06-14 21:10:17 +10:00
d6f84e3953
Merge pull request #23506 from albers/completion-daemon---live-restore
...
bash completion for `docker daemon --live-restore`
Upstream-commit: 74873f192ad0b0cdced4a3fcc2170e5d69aabbb5
Component: engine
2016-06-14 17:24:00 +08:00
56c2250686
Merge pull request #23501 from dmcgowan/fix-overlay-diff-test
...
Remove failing overlay test
Upstream-commit: 31e48e85ef929f2b2b232f4c971f7c7966002539
Component: engine
2016-06-14 10:49:42 +02:00
9edd438677
Merge pull request #23484 from onlyjob/bash-completion
...
Fix syntax errors in bash-completion (Closes : #23483 )
Upstream-commit: 1cb16a1b4130e7e83cbe033bff1daea861696915
Component: engine
2016-06-14 10:13:29 +02:00
0173891ba6
Merge pull request #23361 from docker/swarm
...
Add dependency to docker/swarmkit
Upstream-commit: a1e319e847f41e648ebede7f9d79999d75bd14c8
Component: engine
2016-06-14 00:55:55 -07:00
da7d2c47f4
bash completion for docker daemon --live-restore
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 73882e8f833f3b141c309d543cfe9e84efc00e62
Component: engine
2016-06-14 09:14:25 +02:00
9edf6c9627
Merge pull request #23490 from shishir-a412ed/dm_options_modularized
...
Modularize dm.use_deferred_removal and dm.use_deferred_deletion logic.
Upstream-commit: c69614deae7f20e0dbff8399ce3a8d11014b0f43
Component: engine
2016-06-14 08:47:43 +02:00
dc116784a5
Merge pull request #23093 from tkopczynski/20784-builder-dockerfile-outside-context
...
Builder integration tests for Dockerfile outside context as a unit test
Upstream-commit: 7d988a7aa6ae20020f0f96c6e2a47377e3567a3d
Component: engine
2016-06-14 08:44:24 +02:00
44db465ebc
Remove failing overlay test
...
Diff apply is sometimes producing a different change list causing the tests to fail.
Overlay has a known issue calculating diffs of files which occur within the same second they were created.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 0e74aabbb9aa5cea0b6bf7342f9e325f989468fa
Component: engine
2016-06-13 22:34:57 -07:00
2f81321106
add tutorial
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: ea4fef2d875de39044ca7570c35365b75086e8a5
Component: engine
2016-06-13 22:17:15 -07:00
69f307bc8b
CLI docs
...
Signed-off-by: Amit Shukla <amit.shukla@docker.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9acf97b72a4d5ff7b1bcad36fb19b53775f01596
Component: engine
2016-06-13 22:17:15 -07:00
e808aa4ed0
Add Swarm management CLI commands
...
As described in our ROADMAP.md, introduce new Swarm management commands
to call to the corresponding API endpoints.
This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 12a00e60177ca42bfb1dd9ebd5dce1c7039da6dd
Component: engine
2016-06-13 22:17:15 -07:00
2a2694e613
Merge pull request #23224 from mlaventure/dont-overwrite-existing-deb
...
Do not overwrite already published deb files when releasing
Upstream-commit: 494098534023096f016fa7f184b379929a3f8096
Component: engine
2016-06-13 22:16:53 -07:00
