Commit Graph
25080 Commits
Author SHA1 Message Date
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
Tomasz Kopczynski f0593ff496 Reimplement integration test for symlink Dockerfile as a unit test
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 830584b011ebf75500f307efa5425cf63e89d713
Component: engine
2016-06-14 23:07:19 +02: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
Arnaud Porterie 5cdd8d111f Merge pull request #23533 from dnephin/remove_old_cmd_tag
Remove CmdTag
Upstream-commit: 1704914d7cf8318a69ba9712f664cd031b6e61f6
Component: engine
2016-06-14 20:42:05 +00:00
Anusha Ragunathan 3e617d9868 Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 379ec38222541015acabf4001b57475e45f75918
Component: engine
2016-06-14 13:02:54 -07:00
Tiffany Jernigan b02a41b6a2 Capitalized Docker and Swarm for consistency
Signed-off-by: Tiffany Jernigan <tiffany.f.j@gmail.com>
Upstream-commit: 4c6041cf7f138833f60233c1cc850115abdbde5e
Component: engine
2016-06-14 12:58:17 -07: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
Yong Tang 83176e8d77 Add security info to docker info
The security infomation has already been added to `GET /info` in #21172.
However, it is not part of the output of `docker info` yet.

This fix adds the security information to `docker info`.

Additional tests has been added to cover changes.

This fix fixes #23500. This fix is related to #20909, #21172.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: eee20b564ffae0b8c8043115c959f0f9d1869fed
Component: engine
2016-06-14 12:23:45 -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
Alexander Morozov 4493a22384 Merge pull request #23348 from vdemeester/migrate-cp-to-cobra
Migrate cp command to cobra
Upstream-commit: 81a85cf4481d804df59ba7aa7ecb0df5f7f9e008
Component: engine
2016-06-14 10:49:22 -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
Stefan J. Wernli b47fcaaeab Fixing exit code return on error case in Windows.
Right now, if we hit an error retrieving the exit code in HCS process.ExitCode, we return that 0 and that error.  Golang convention says that if an error is returned the other values should not be used, but the caller of ExitCode in libcontainerd has to fall through if an error is received.  Rather than return a success exit code in that failure case, we should return -1 to indicate a generic failure.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 17c1b9c061139a2655252f6fb5e36f616a8c5f5e
Component: engine
2016-06-14 10:19:55 -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
Kenfe-Mickael Laventure 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
Kenfe-Mickael Laventure 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
Kenfe-Mickael Laventure 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
Kai Qiang Wu(Kennan) 250b4af05c Add ecryptfs check for overlay2
We added docs about ecryptfs check but not in code side.
Also refactor code to make it clean.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 136323b04315eceffbed61d680878ed23cecc015
Component: engine
2016-06-14 14:25:52 +00:00
Sven Dowideit 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
Sven Dowideit 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
Shoubhik Bose c8d6ba6b3c Fixes #23376 Broken URL for Centos yum repo for docker changed to now have a hardcoded centos version 7
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
Upstream-commit: d3fad80cc7823eddb823dd53424a28ee81043f18
Component: engine
2016-06-14 10:06:00 +00:00
Lei Jitang 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Tibor Vass 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
Harald Albers 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
Vincent Demeester 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
Vincent Demeester 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
Derek McGowan 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
Charles Smith 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
Amit Shukla 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
Daniel Nephin 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
Tibor Vass 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
Arnaud Porterie (icecrime) 429bf7a983 Add swarm api reference docs
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: d4abe1d84a58461fea54d2046c24ae5d869fa41e
Component: engine
2016-06-13 22:16:18 -07:00
Tonis Tiigi 7a33d63cb2 Swarm integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0d88d5b64b69a451d374e322b2abe64140a6cd1c
Component: engine
2016-06-13 22:16:18 -07:00
Tonis Tiigi be63983b3a Add Swarm management backend
As described in our ROADMAP.md, introduce new Swarm management API
endpoints relying on swarmkit to deploy services. It currently vendors
docker/engine-api changes.

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: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 534a90a99367af6f6bba1ddcc7eb07506e41f774
Component: engine
2016-06-13 22:16:18 -07:00
Tonis Tiigi 230cf74120 Add dependency to docker/swarmkit
Add a dependency to `docker/swarmkit` in preparation for adding
first-class Swarm-wide service management inside the Docker Engine as
described in our ROADMAP.md.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 44793049ce1ad364720b4be915a92291d1f808c2
Component: engine
2016-06-13 22:16:18 -07:00
Alexander Morozov c5ea3eb7f3 Merge pull request #23373 from capkurmagati/23211-spf13-cobra-ps
Migrate ps command to cobra
Upstream-commit: c81c131a409a04ca11686c71798acf9df8ddfdbc
Component: engine
2016-06-13 22:12:20 -07:00
Michael Crosby 9ada0cfc5f Merge pull request #23213 from crosbymichael/restore-option
Add --live-restore flag
Upstream-commit: 3020081e94277410984c62d12f88de3d4f258681
Component: engine
2016-06-13 20:57:19 -07:00