54575c4167
Fix issue in --ip6 validation for docker create
...
This fix tries to address the issue raised in comment:
https://github.com/docker/docker/pull/25943#discussion_r76843081
Previously, the validation for `ip6` is done by checking ParseIP().To16().
However, in case an IPv4 address or an IPv4-mapped Ipv6 address has been
provided, the validation will pass (should fail).
This fix first check if `--ip6` is passed with a valid IP address and returns
error for invalid IP addresses. It then check if an IPv4 or IPv4-mapped Ipv6
address is passed, and return error accordingly.
This fix adds two more cases in the tests. One for IPv4 address passed to `--ip6`
and another for Ipv4-mapped IPv6 address passed to `--ip6`. In both cases,
without this fix the validation will pass through.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 1e6eccae69bd9b1f65ec87c33a6a872c81f7fb23
Component: engine
2016-08-30 19:28:44 -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
1318d71626
Merge pull request #24116 from frapposelli/add-photon-rpm
...
Add RPM builder for VMware Photon OS
Upstream-commit: 9718d5377fa41b5ff50b62c031fb943ceb668c20
Component: engine
2016-08-30 17:08:56 -07:00
cc7e4cafad
Add rpm builder for VMware Photon OS
...
Signed-off-by: Fabio Rapposelli <fabio@vmware.com >
Upstream-commit: 6c7e1863d552afe156eb430575cbc0e1057a77e1
Component: engine
2016-08-30 17:05:32 -07:00
23c1ddf73c
Merge pull request #26140 from yuexiao-wang/modify-usage
...
Modify options for the command plugin install
Upstream-commit: ec82819cc9c652908fd74fb2082900dfa0468bcc
Component: engine
2016-08-31 00:04:45 +00: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
b4cb86292e
Merge pull request #26162 from tonistiigi/print-stack-on-leave
...
Print stacktrace on failing to leave cluster
Upstream-commit: 67510c75e974f437e2a13c3b169371d7d56eaf40
Component: engine
2016-08-30 23:36:42 +00:00
e09b4da22d
Merge pull request #26158 from mlaventure/reexport-exitcode
...
Reexport exitcode
Upstream-commit: 0fc393674c1fd345947e4dbfd6935fe045c9b650
Component: engine
2016-08-30 16:02:48 -07:00
af4e81149a
typo
...
Signed-off-by: Javier Bassi <javierbassi@gmail.com >
Upstream-commit: 682a8ecb8b77e35745c1720b9c9ee9a5fe885fa4
Component: engine
2016-08-30 19:46:07 -03: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
3034e8ce29
Print stacktrace on failing to leave cluster
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 166d24e464a746dfb3359ee18be90fbd8563515c
Component: engine
2016-08-30 14:17:32 -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
ba213d0956
Re-export container state's ExitCode and Error fields
...
Those are needed in order to reload their value upon docker daemon
restart.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 2998945a54577e24a6414d576bc861e58fa87359
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
58d79a8716
Merge pull request #26145 from allencloud/update-command-description
...
update command description
Upstream-commit: 19aee549269ab7e7a025aaf7b820577f52dc4443
Component: engine
2016-08-30 22:16:57 +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
691c290c4d
Merge pull request #26123 from cpuguy83/revert_makefile_build_args
...
Fix passing custom APT_MIRROR on building Docker
Upstream-commit: 5c2064f890fb1fa5f3642ae135e5145d4bd0ae13
Component: engine
2016-08-30 17:30:48 +02:00
44b8f27e57
Merge pull request #26134 from lixiaobing10051267/masterDockerExec
...
Modify use of docker exec command in exec.go
Upstream-commit: 5bd14f88cdb38978c28b015ddc0ce343b72b408b
Component: engine
2016-08-30 08:27:02 -07:00
feabcf715e
update command description
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 123ce0e4be7c2743c5dee0a9aff84cd2c23758e0
Component: engine
2016-08-30 23:07:42 +08:00
1f1420a059
Merge pull request #25214 from allencloud/make-node-ps-default-to-self
...
make node ps default to self in swarm node
Upstream-commit: bb1d70da9ad5804794b7aea77abe59fb9e3ac196
Component: engine
2016-08-30 10:37:20 -04:00
db8a613cf1
Merge pull request #26127 from lixiaobing10051267/masterDockerDeploy
...
usage description of docker deploy in md not consistant with go file
Upstream-commit: afd54a1a8645bde7d5d87efc5567ee0d3c788e78
Component: engine
2016-08-30 10:18:19 -04:00
0ecc84d963
Modify usage of docker exec command in exec.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 26bd3e8b11dd9ef9a8226341ed04cbc8a58776cc
Component: engine
2016-08-30 22:14:55 +08:00
82132c60b7
Pass through build APT_MIRROR as separate var
...
DOCKER_BUILD_APT_MIRROR
This allows passthrough of other options like HTTP_PROXY from
DOCKER_BUILD_ARGS to work on all builds (for example,
ensure-syscall-test) when APT_MIRROR is set.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 39c87c79c848456aaa12a6ecfd658a9e94f94d65
Component: engine
2016-08-30 09:09:31 -04: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
1b0ecb4bfa
Merge pull request #26096 from ohmystack/fix/docs-dockerd
...
Add docs for "--containerd" in dockerd
Upstream-commit: 644cb53b41b49fd750fe9c86e922125ef8156259
Component: engine
2016-08-30 13:36:50 +01:00
d4a3fcb2c8
Merge pull request #26124 from darrenstahlmsft/RestoreLock
...
Lock concurrent access to remove map during Daemon restore
Upstream-commit: 4e1eb10cf28c109ca887408155d84a847aa233fc
Component: engine
2016-08-30 13:06:01 +02:00
558afd07bb
Modify options for the command plugin install
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: d08886618eac804e879cc2953a3a07863e90e5e6
Component: engine
2016-08-30 18:45:06 +08:00
37e3bbaff0
make node ps default to self in swarm node
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b13f5dfd130a69b0eb655d349b7839f12a9384ed
Component: engine
2016-08-30 17:34:16 +08:00
4cd762346d
Merge pull request #25521 from allencloud/modify-vendor-script
...
better vendor.sh to break when fail in grep
Upstream-commit: 92da332638597cf424090b16a90435ea4601891a
Component: engine
2016-08-30 11:26:41 +02:00
d43b3ba23f
Merge pull request #26093 from yongtang/26090-service-update-with-name
...
Fix issue in API `POST /services/(id or name)/update`
Upstream-commit: 6e09e142a17f2686ebb1a906c53cab593a866ed1
Component: engine
2016-08-30 11:11:08 +02:00
2aa55a3d95
Fix typo in builder.md
...
Signed-off-by: Kris-Mikael Krister <krismikael@protonmail.com >
Upstream-commit: afcfa77dd80defa996d7d0e073d809ac03493f05
Component: engine
2016-08-30 09:34:10 +02: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
c6f2532e79
usage description of docker deploy in md not consistant with go file
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 3298bfcb56c17cd2a0e123cb10074bcc73e1bba9
Component: engine
2016-08-30 11:40:51 +08:00
