Commit Graph

3769 Commits

Author SHA1 Message Date
5b72529835 Revert "Change related tests from DockerSuite to DockerDaemonSuite in docker_cli_info_test.go"
This reverts commit 0ce5ef279cee13e92d696ae871fe81de37cec253.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f0e99972877f06904e0327e9537de8390b5cfb4b
Component: engine
2016-08-31 11:52:22 -07:00
033314a228 Merge pull request #26170 from Microsoft/jjh/testimages
Windows: Enable TestImage and TestImport tests
Upstream-commit: fbcf0a50b20e3ae10bc6a4d385b00b618683a24a
Component: engine
2016-08-30 17:52:50 -07:00
b5b3cd120e Merge pull request #26166 from Microsoft/jjh/testhelp
Windows: Enable TestHelpExitCodesHelpOutput
Upstream-commit: b26059a0ca06d9f15b81e3146f3fdf21bc9def3e
Component: engine
2016-08-30 17:50:52 -07:00
9e4e7e8763 Merge pull request #26165 from Microsoft/jjh/testexec
Windows: Enable a couple of exec tests
Upstream-commit: 4d15f428b18283e62e39cb48e3560315a11511aa
Component: engine
2016-08-30 17:50:25 -07:00
340d6d4267 Merge pull request #26164 from Microsoft/jjh/testcreate
Windows: Enable some create CI tests
Upstream-commit: 75dc3614f78dbbaf20f99153456fad86656f7b87
Component: engine
2016-08-30 17:49:57 -07:00
dc05468dea Merge pull request #26163 from Microsoft/jjh/testcp
Windows: Enable some cp integration tests
Upstream-commit: 5d5d80ca6931926aae2a77d9f6d56a616408e939
Component: engine
2016-08-30 17:49:26 -07:00
301f93448b Merge pull request #26161 from Microsoft/jjh/testcontainerapi
Windows: Port api_containers_test tests
Upstream-commit: 69f25f9da819ea01a59d7697133dd11aa8045a5d
Component: engine
2016-08-30 17:48:43 -07:00
7d95254126 Merge pull request #26154 from yongtang/08302016-docker-cli-info-test-DockerDaemonSuite
Change related tests from DockerSuite to DockerDaemonSuite in `docker_cli_info_test.go`
Upstream-commit: 399761af4d508e5afe09d44bb350a1946cd719fb
Component: engine
2016-08-30 16:56:00 -07:00
fc4e2188e9 Windows: Enable TestImage and TestImport tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7ea707d5ef94f95dd0eaa10797e1b82157bfeb96
Component: engine
2016-08-30 15:20:55 -07:00
76b23556e1 Windows: Enable TestHelpExitCodesHelpOutput
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f93f692e51f05481d9eb5163108d1eda36faf117
Component: engine
2016-08-30 15:05:02 -07:00
7ff0928110 Windows: Enable a couple of exec tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ea42182722be246b2048497908862a31cf903118
Component: engine
2016-08-30 15:03:18 -07:00
2c2936c670 Windows: Enable some create CI tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 78aede292b513d6586e2cd01cda03eb57bf50530
Component: engine
2016-08-30 14:38:19 -07:00
ba11bf3dd5 Windows: Enable some cp integration tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 088c3eeea8ae6e46bf698d0c99c98b92bc894063
Component: engine
2016-08-30 14:32:10 -07:00
d7713e33ac Add integration test to check persistence of exitcode and error message
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 88bfa6ede8fd1536d8248cc56882bc4b826d090d
Component: engine
2016-08-30 14:17:09 -07:00
027f36b73d Windows: Port api_containers_test tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3d5aac305f447ad545192c002a5bcef59925240d
Component: engine
2016-08-30 14:15:33 -07:00
db247f3de4 Merge pull request #26020 from tonistiigi/fix-eventsbefore-test
Fix flaky TestEventsContainerFilterBeforeCreate
Upstream-commit: 73614f9f1e606cd9282589d11481d01c21dfe3fe
Component: engine
2016-08-30 22:24:52 +02:00
cf98ba1499 Merge pull request #26153 from Microsoft/jjh/testcommitcli
Windows: Enable some commit tests
Upstream-commit: cf3e834c9b0e7f48959c099dc983f3d1f6ccb18d
Component: engine
2016-08-30 22:17:20 +02:00
341c5e093f Merge pull request #26147 from Microsoft/jjh/testbuildapi
Windows: Enable 5 Build API tests
Upstream-commit: 8a46c18dd4e4f8091b9e02ef5b476e8b8aa77c47
Component: engine
2016-08-30 22:12:36 +02:00
b4e6ad86f8 Merge pull request #26149 from Microsoft/jjh/testbuildcli
Windows: Enable multiple cli build tests
Upstream-commit: 16148d04207c131b2fe01f35301d58d2609a1b54
Component: engine
2016-08-30 22:12:24 +02:00
da325a829b Change related tests from DockerSuite to DockerDaemonSuite in docker_cli_info_test.go
This fix changes related tests from DockerSuite to DockerDaemonSuite
in `docker_cli_info_test.go`. Previously that was done through `NewDaemon()`.

This fix is related to the comments in:
https://github.com/docker/docker/pull/26115#discussion_r76784977
https://github.com/docker/docker/pull/24533#issuecomment-243420042

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0ce5ef279cee13e92d696ae871fe81de37cec253
Component: engine
2016-08-30 10:11:01 -07:00
873d669a48 Windows: Enable multiple cli build tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: bb4b31585c19b5d20a536c615e54b2fe48f8054c
Component: engine
2016-08-30 09:51:13 -07:00
3fb9dd8f96 Windows: Enable some commit tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ac59dfa761b0681cb67d11184ef62cc16ec93570
Component: engine
2016-08-30 09:48:18 -07:00
0957712290 Windows: Enable docker_cli_history_test
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a06c695177016398e434b0436268c38c3f4c112d
Component: engine
2016-08-30 09:31:33 -07:00
0496cb3f89 Windows: Enable 5 Build API tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8bc1c9c08a09b7f47d8429645a061cb29fb8118e
Component: engine
2016-08-30 08:41:17 -07:00
6e19944380 Merge pull request #25890 from cpuguy83/fix_swarm_control_sock_path
Use daemon exec root for swarm control socket
Upstream-commit: edafc642b2b12d7428e72f922a2b44c3b62ffc31
Component: engine
2016-08-30 08:51:52 -04:00
6b838755f5 Fix issue in API POST /services/(id or name)/update
This fix tries to address the issue raised in 26090 where
remote API `POST /services/(id or name)/update` cannot
use `name` to update. This is not consistent with the
documentation of the remote API.

This fix fixes this issue by performing a lookup with `getService`
in case `name` instead of `id` is used in API.

This fix adds an integration test to cover the changes.

This fix fixes 26090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 80e3975117161ae4ce00cc34c7e2b70e45ee43c5
Component: engine
2016-08-29 21:13:53 -07:00
6db424fe1d Windows: Enable 2 TestAttach* tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 934fe3f73ee2afccfa051ade5487e39bfa9e1718
Component: engine
2016-08-29 15:57:27 -07:00
edf9053174 Merge pull request #25317 from yongtang/25304-docker-service-create-group
Support `--group` in `docker service create`
Upstream-commit: d09c04a667fc2895650b0c2bb25e28fb226e3f31
Component: engine
2016-08-29 10:27:31 -04:00
97464f18e4 Merge pull request #25990 from vieux/plugin_inspect
add -f to plugin inspect
Upstream-commit: bf0077c138a1cf64a42828014c44f8e2b2001703
Component: engine
2016-08-28 17:03:40 +02:00
63926fbdf3 Merge pull request #26055 from mavenugo/ndn
Support container disconnect for non-existing network
Upstream-commit: 9ea28ea8944744d9dc8f50bdc1733868fda6ce7f
Component: engine
2016-08-28 01:48:02 +00:00
bdcdcdfff5 Support --group-add and --group-rm in docker service create/update
This fix tries to address the issue raised in 25304 to support
`--group-add` and `--group-rm` in `docker service create`.

This fix adds `--group-add` to `docker service create` and `docker service update`,
adds `--group-rm` to `docker service update`.

This fix updates docs for `docker service create` and `docker service update`:
1. Add `--group-add` to `docker service create` and `docker service update`
2. Add `--group-rm` to `docker service update`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b31969ee365f582eb71a7962af9638d79380cd54
Component: engine
2016-08-27 11:54:05 -07:00
8bee71dfee Support container disconnect for non-existing network
There are cases such as migrating from classic overlay network to the
swarm-mode networking (without kv-store), such a mechanism to allow
disconnecting a container even when a network isnt available will be
useful.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 05a3f2666ee34c2dfa04663bbdda3c7763b001d8
Component: engine
2016-08-26 16:48:52 -07:00
67ccfbdecc Merge pull request #25424 from vieux/enabled
replace active by enabled for consistency in plugins
Upstream-commit: ed0dff8f16716b4f6debfc191124e98750dd05bb
Component: engine
2016-08-26 15:22:41 -07:00
24f71df076 Merge pull request #25861 from WeiZhang555/wait-remove-for-start
Using waitExitOrRemoved for `docker start`
Upstream-commit: bdadcfc1bbb04950c4835cfa4d75f0e480555a2f
Component: engine
2016-08-26 13:36:56 -07:00
d5c2d4c2f5 Merge pull request #23830 from ardnaxelarak/23345_remove_name_from_volume_create
remove --name flag from volume create
Upstream-commit: 5168c93419547338b11f5d24d24a2a025ea64524
Component: engine
2016-08-26 21:52:07 +02:00
71cbf188b7 Merge pull request #23614 from icecrime/inspect_services
Allow `docker inspect` on all types
Upstream-commit: 6e85b81df2f0a2485b74409813eaa77a2b366685
Component: engine
2016-08-26 18:45:23 +00:00
0fa4cceabc Merge pull request #25177 from cpuguy83/fix_TestDaemonDiscoveryBackendConfigReload
TestDaemonDiscoveryBackendConfigReload behavior
Upstream-commit: 175f6eb55f61b5caf915db9bd6786a2f2d9103da
Component: engine
2016-08-26 10:54:48 -07:00
aa95624624 TestDaemonDiscoveryBackendConfigReload behavior
`TestDaemonDiscoveryBackendConfigReload` was doing some wierd things
with files, creating a file (directly in `./integration-cli`), removing
it, then creating a new file.
This is just weird, so fixed it to use a single file, file will go into
a temp dir so it doesn't pollute integration-cli.

It was also blindly sending a SIGHUP to the daemon process then sleeping
for 3 seconds.  This is racey, and slow.
Change this to look for the daemon-reload event in the event stream.
Reload logic is moved to a separate function and blocks (w/ a timeout)
waiting for the reload event to fire.

Runtime of the test is now ~0.5s on my machine, where as it was a
minimum of 3s due to the `time.Sleep` before.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 20f99a8634accf54a923982f8c9a3b6719933f74
Component: engine
2016-08-26 11:02:04 -04:00
e357d485dd add -f to plugin inspect
Signed-off-by: Victor Vieux <vieux@docker.com>

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 63a19edcb18b1bc650cc1d6eed78c2c3b376be62
Component: engine
2016-08-25 22:40:05 -07:00
6068b202c6 Validate --ip and --ip6 for docker create
This fix tries to fix the issue raised in 25863 where `--ip` value
is not validated for `docker create`. As a result, the IP address
passed by `--ip` is not used for `docker create` (ignored silently).

This fix adds validation in the daemon so that `--ip` and  `--ip6`
are properly validated for `docker create`.

An integration test has been added to cover the changes.

This fix fixes 25863.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c7045eb93523df76feb9f3e00540e69471a1855e
Component: engine
2016-08-25 22:11:23 -07:00
e44f33953e replace active by enabled for consistency in plugins
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: cf4e268115911e9e4a4da94dc00b2dc370f86a47
Component: engine
2016-08-25 20:42:49 -07:00
83ee5a765b Refactor docker inspect to work on all types
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 3db9f7afce03b1926fd6ba22483ebf0d76d2a1da
Component: engine
2016-08-25 16:29:08 -07:00
346f8a271b Add option to specify name without --name in volume create
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
Upstream-commit: ba3f0bf0e7d4f94eb94023278adcfad4ca8fe9d7
Component: engine
2016-08-25 14:20:06 -07:00
de17e6a998 Merge pull request #25354 from dnephin/remove-mflag-from-dockerd
Convert docker and dockerd commands to spf13/cobra
Upstream-commit: 25587906d122c4fce0eb1fbd3dfb805914455f59
Component: engine
2016-08-25 17:19:19 -04:00
4cad859c7a Merge pull request #25978 from justincormack/no-no-gccgo
Remove gccgo support
Upstream-commit: 8d99dfbc69a18cbf1e604b845df76fdedcf2e853
Component: engine
2016-08-25 12:12:29 -07:00
6fe71d9070 Fix flaky TestEventsContainerFilterBeforeCreate
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e372883fcd38aab4d18c11be41e38574250c4c25
Component: engine
2016-08-25 10:29:10 -07:00
8ad0a6fe8f Fix tests and windows service.
Support args to RunCommand
Fix docker help text test.
Fix for ipv6 tests.
Fix TLSverify option.
Fix TestDaemonDiscoveryBackendConfigReload
Use tempfile for another test.
Restore missing flag.
Fix tests for removal of shlex.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6e7405ebd4df360bc84f651c977ece31283eb3ee
Component: engine
2016-08-25 13:09:36 -04:00
87a50d0cba Merge pull request #25816 from anusha-ragunathan/vol-plugin-list
Make `docker volume list` lookup plugins installed using new model.
Upstream-commit: 0c6926070f775987de19e34e6f8da95cae156195
Component: engine
2016-08-25 19:02:25 +02:00
b2a5cc3911 Using waitExitOrRemoved for docker start
Currently start command will invoke getExitCode - which is based on
Inspect API - to get returned exit code after container exits.
There's two race conditions here:

if container is started with Restart Policy, there's chance that the
container is restarted quickly before it calls getExitCode, under such
circumstance, the exit code is wrong.

if container is started with --rm, it's possible that container is
removed before getExitCode, in this situation, you can't get correct
exit code either.

Replace getExitCode with waitExitOrRemoved can solve this problem.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: b8464c1c9baf6714242cbd9b834344eff2ebfba8
Component: engine
2016-08-26 00:16:49 +08:00
84a36bbfd3 Merge pull request #24073 from johnharris85/move-restart-policy-check-to-daemon
Move restart-policy validation from client to daemon.
Upstream-commit: d13ad3ef7684bf330cec2eaa4a14048e3fbc2d94
Component: engine
2016-08-25 17:02:30 +02:00