docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
27,001 Commits 12 Branches 296 Tags
54fd9ae518cd57144a2820395fac7438e8a23ebb
Commit Graph

3791 Commits

Author SHA1 Message Date
Vincent Demeester
637e45cd56 Merge pull request #26290 from tonistiigi/govet17 
Fix govet for go1.7
Upstream-commit: c73fae2352788323476759f4199b034b7ffc54dd
Component: engine
 2016-09-03 19:27:19 +02:00
Tonis Tiigi
833a33ebb8 Fix govet for go1.7 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7a8c7b47cffa8485b03db715f78c087b01ae5dfa
Component: engine
 2016-09-02 19:07:54 -07:00
Daniel Nephin
300565157d Merge pull request #26225 from yongtang/26173-docker-import-quoted-change 
Fix issue in `docker import -c` with quoted flags
Upstream-commit: 2e0bc0393a7a8f912e0d05d1806c770c1c8c6790
Component: engine
 2016-09-02 13:34:25 -04:00
Brian Goff
deca0aec9f Merge pull request #26261 from Microsoft/jjh/morebuildtests 
Windows CI: Enable some more build tests
Upstream-commit: 84ebbb52314433d4724ad9c75c7d04e886fb59bd
Component: engine
 2016-09-02 09:41:08 -04:00
Justin Cormack
e92f9d7cac Merge pull request #24510 from runcom/new-seccomp-format 
New seccomp json format
Upstream-commit: 9d71cba5f09825cdafe04fdb0243cc30bf887b68
Component: engine
 2016-09-02 09:14:01 +01:00
Yong Tang
e2707394d0 Fix issue in docker import -c with quoted flags 
This fix tries to address the issue in 26173 where `docker import -c`
with quoted flags returns an error.

The issue was that in `api/client/image/import.go` the flag
`--change/-c` was handled by `StringSliceVarP` which does not handle
the quote well.

The similiar issue was enountered for 23309 (`docker commit`).

This fix takes the same approach as 23309 where `StringSliceVarP`
was replaced with `VarP` and `opts.ListOpts`.

An integration test has been added to cover the changes.

This fix fixes 26173.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a79a27412d721a042ae96b411ab1b5b926a7d28a
Component: engine
 2016-09-01 16:28:22 -07:00
John Howard
9968a690ca Windows CI: Enable some more build tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ede6163ec684efd04faffa8ce6d7f4213fe08c75
Component: engine
 2016-09-01 16:27:04 -07:00
Vincent Demeester
19ba10b1b0 Merge pull request #26172 from Microsoft/jjh/testinspect 
Windows: Enable multiple TestInspect tests
Upstream-commit: a19bdec6f0f2ca1b7539f701583f2f33f1923a2c
Component: engine
 2016-09-01 19:46:19 +02:00
Tõnis Tiigi
a1893f6374 Merge pull request #26077 from runcom/fix-TestImportBadURL 
integration-cli: fix TestImportBadURL w/o network
Upstream-commit: 83fc63f9678cd1233bb0f86591a558acada621ac
Component: engine
 2016-09-01 09:30:02 -07:00
Vincent Demeester
9c1528efb8 Merge pull request #26226 from YuPengZTE/devTest 
The first letter should be small in errors.New
Upstream-commit: 8abaf62715fab8422f20a28af2ff848223898839
Component: engine
 2016-09-01 17:28:32 +02:00
Antonio Murdaca
009555a4b2 New seccomp format 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 5ff21add06ce0e502b41a194077daad311901996
Component: engine
 2016-09-01 11:53:07 +02:00
Justin Cormack
a03ebc79ee Merge pull request #26200 from runcom/engine-api-vendor 
vendor docker/engine-api@f9cef59044
Upstream-commit: 8ccac1ad4de898583113d036810da3a35a9be906
Component: engine
 2016-09-01 10:51:34 +01:00
Vincent Demeester
d73fb19f36 Merge pull request #26180 from yongtang/25943-validate-ip6 
Fix issue in `--ip6` validation for `docker create`
Upstream-commit: f173555de8201d8b4a6578a52d405655212fbb5d
Component: engine
 2016-09-01 11:02:16 +02:00
Vincent Demeester
861fb5fa76 Merge pull request #26181 from yongtang/08302016-DockerDaemonSuite-NewDaemon 
Change related test from DockerSuite to DockerDaemonSuite in `docker_cli_daemon_test.go`
Upstream-commit: b8d510e86ad6a70aad09442b89e0e984b14e0c72
Component: engine
 2016-09-01 09:42:59 +02:00
YuPengZTE
c484c505e6 The first letter should be small in errors.New 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: e7935da2390bf458f07e9898f08a332ef9f53255
Component: engine
 2016-09-01 11:26:40 +08:00
Arnaud Porterie
d6cc83cde2 Merge pull request #26208 from talex5/fix-health-test 
Fix exec form of HEALTHCHECK CMD
Upstream-commit: 5a56f29c64ab1a2bb4f70ba65f248cd8fcebc57f
Component: engine
 2016-08-31 23:27:39 +00:00
Antonio Murdaca
1965814a4e vendor docker/engine-api@f9cef59044 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 8f7a8c75ae251f1260299892c5de7c83224b110e
Component: engine
 2016-08-31 22:39:13 +02:00
Tonis Tiigi
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
Thomas Leonard
22f7fc770f Fix exec form of HEALTHCHECK CMD 
We attached the JSON flag to the wrong AST node, causing Docker to treat
the exec form ["binary", "arg"] as if the shell form "binary arg" had
been used. This failed if "ls" was not present.

Added a test to detect this.

Fixes #26174

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
Upstream-commit: e95b6b51daed868094c7b66113381d5088e831b4
Component: engine
 2016-08-31 17:50:12 +01:00
John Howard
6f341d34b6 Windows: Enable multiple TestInspect tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3ae6cd453ece9761a951efd839cf917078b03718
Component: engine
 2016-08-31 08:12:50 -07:00
Yong Tang
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
Yong Tang
ab000f181d Change related test from DockerSuite to DockerDaemonSuite in docker_cli_daemon_test.go 
This fix is a follow-up of 26154. I did a grep on `integration-cli` and
found out that there are several tests in `docker_cli_daemon_test.go`
that still use `NewDaemon` instread of `DockerDaemonSuite`.

This fix changes related tests from DockerSuite to DockerDaemonSuite in
`docker_cli_daemon_test.go`.

With this fix, now `NewDaemon` is only called from `SetUpTest` on
various DockerXXXSuite. That should help maintain the test code base.

This fix is related to the comments in:
26115
24533.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 5c0fd2d06e82ed56cec33702a68fbc77ac14cb6b
Component: engine
 2016-08-30 18:30:27 -07:00
Tõnis Tiigi
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
Tõnis Tiigi
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
Tõnis Tiigi
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
Tõnis Tiigi
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
Tõnis Tiigi
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
Tõnis Tiigi
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
Alexander Morozov
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
John Howard
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
John Howard
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
John Howard
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
John Howard
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
John Howard
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
Kenfe-Mickael Laventure
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
John Howard
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
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
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
Yong Tang
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
John Howard
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
John Howard
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
John Howard
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
John Howard
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
Brian Goff
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
Yong Tang
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
John Howard
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
Brian Goff
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
Vincent Demeester
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