starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-28 02:06:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
31,311 Commits 15 Branches 323 Tags
340a67b15158645180e2a87fb413b9fc6e5ff2f2
Commit Graph
31311 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Christophe Mehay f31ca9220e Force copy on make install to avoid Text file busy error 
Signed-off-by: Christophe Mehay <cmehay@online.net>
Upstream-commit: 01273ad85f334ff0ae141cfa8ab0e52ca895fd3d
Component: engine
 2017-02-13 14:17:06 +01:00
Vincent Demeester d60e30c4e4 Merge pull request #30871 from allencloud/split-swarm-test-into-multiple-files 
split docker_api_swarm_test.go into multiple files
Upstream-commit: a11e3bd5f943bbefecec3613a6e919b827adf05d
Component: engine
 2017-02-13 11:42:25 +01:00
Sebastiaan van Stijn 0b67975de7 Merge pull request #30965 from YuPengZTE/devDes 
fix typo
Upstream-commit: a8f4d82176139babcd818fcb4590eec22860ffc9
Component: engine
 2017-02-13 00:02:28 -08:00
yupengzte 4d0e710fd3 fix typo 
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 266107f301b8d470f6ff67da41960fccf9e1a4ba
Component: engine
 2017-02-13 15:47:38 +08:00
Sebastiaan van Stijn 83500fc7d6 Merge pull request #30956 from yongtang/02122017-deprecated-login-email-removal 
Add missing link in deprecated.md
Upstream-commit: b5b6752230b77902536bab28403426c30d6f6ce0
Component: engine
 2017-02-12 23:37:37 -08:00
Sebastiaan van Stijn af3282f0f9 Merge pull request #30940 from sdurrheimer/zsh-completion-swarm-unlock-cmds 
Add zsh completion for 'docker swarm unlock|unlock-key' commands
Upstream-commit: 27ab0086263986033bde45d0c48423408cd653ea
Component: engine
 2017-02-12 23:35:46 -08:00
Michael Friis 678dc675ed update git, hoist powershell setttings to top and use simpler way to get git 
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 5e19064462ebb23b36170c1bd68d44c03a40e564
Component: engine
 2017-02-12 19:27:05 -08:00
Sebastiaan van Stijn 24325b22dd Merge pull request #30960 from allencloud/remove-redundant-colon 
remove redundant colon introduced by mistake
Upstream-commit: db68291dabe402428c25bfab72b4f580692d8c4a
Component: engine
 2017-02-12 18:22:32 -08:00
allencloud 877717c8a7 remove redundant colon introduced by mistake 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: df64bc3ed0e315a1064937d1a3ad6d0f324b11c8
Component: engine
 2017-02-13 10:16:57 +08:00
Yong Tang b0073b9ee0 Add missing link in deprecated.md 
This fix adds a missing link in deprecated.md
```
Deprecated In Release: [v1.13.0]...
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ee65dd0286b2e3d5d5b3a61c24972b962363c0de
Component: engine
 2017-02-12 15:15:52 -08:00
Yong Tang feca9bd63f Add attachable for network object in swagger api docs 
This fix adds `Attachable` property for network object
in the documentation of Swagger API docs

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ca020416e40ac0aa710aff34e278b2c981812ab2
Component: engine
 2017-02-12 14:07:55 -08:00
Vincent Demeester 96d98e23ed Merge pull request #30900 from YuPengZTE/devPublisedPort 
Add "=" before the value of PublishedPort
Upstream-commit: c110abfa9f4c1ec33dc223570fad50c5f6afc00d
Component: engine
 2017-02-12 21:56:43 +01:00
Vincent Demeester 148ba17651 Merge pull request #30939 from sdurrheimer/zsh-completion-swarm-init-update 
Add zsh completion for missing 'docker swarm init|update' options
Upstream-commit: 5d47cb901b90953e8e85bac4b66ff8fb0af04d07
Component: engine
 2017-02-12 21:49:00 +01:00
Steve Durrheimer ef55c9e78c Add zsh completion for 'docker {ps,service ls} --filter expose|publish' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ac5608093088aef34aa1edc2eb7b5b351bd2ce78
Component: engine
 2017-02-12 21:24:13 +01:00
Steve Durrheimer 5c8b540ba0 Add zsh completion for 'docker {service ls,stack services} --format' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8afb7f035de7f13aefc0548d33f37ed8735c3545
Component: engine
 2017-02-12 21:17:00 +01:00
Steve Durrheimer a470ff2f53 Add zsh completion for 'dockerd --default-shm-size' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1c387303af66a7bcef580f399ea06c30c9357d44
Component: engine
 2017-02-12 21:10:37 +01:00
Steve Durrheimer f7e5894d00 Add zsh completion for missing 'docker plugin' commands and options 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7ee899065f7dd8b394b44854be017aa10479dfa2
Component: engine
 2017-02-12 20:52:15 +01:00
Steve Durrheimer 0f63ede0ab Add zsh completion for 'docker build --squash' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 5b3f5f97f2bfd76a61f01adebd66ae9d9e2ca19d
Component: engine
 2017-02-12 20:11:13 +01:00
Steve Durrheimer 7410dd47b5 Add zsh completion for 'docker checkpoint' commands 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0011a9eddd8be2a3f70e6edcba1a57a0ac4809e9
Component: engine
 2017-02-12 20:06:38 +01:00
Steve Durrheimer 80f83d2568 Add zsh completion for 'docker service logs' command 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a89a104fb63ab832d37b369499e1ad9abc1db92f
Component: engine
 2017-02-12 17:54:34 +01:00
Steve Durrheimer 195563bec5 Add zsh completion for 'docker swarm unlock|unlock-key' commands 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e9a10ef4adedd380f2556329dd0d0b5bf06aa0a5
Component: engine
 2017-02-12 17:44:17 +01:00
allencloud 6aa42ecc9e add CheckDuplicate docs and logics in network 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 94b880f919937b3995a3424a284d1f6769e60f4b
Component: engine
 2017-02-13 00:34:40 +08:00
Steve Durrheimer 3963cf1336 Add zsh completion for missing 'docker swarm init|update' options 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e31a6f278b48b61f70fe9816e0bc21770247b2c7
Component: engine
 2017-02-12 17:31:32 +01:00
Sebastiaan van Stijn ab0b74a271 Merge pull request #30886 from vieux/bring_back_changelog 
add 1.13.x CHANGELOG to master
Upstream-commit: 58152530ccaa856bfea9d28fb8221eb76ca83dda
Component: engine
 2017-02-11 18:19:00 -08:00
Sebastiaan van Stijn a4e64b5e9f Merge pull request #30476 from yongtang/30447-port-config-long-syntax 
Support expanded syntax of ports in `docker stack deploy`
Upstream-commit: e5066ef66637967dd0e433daaca5d8f957f4c022
Component: engine
 2017-02-11 11:13:54 -08:00
allencloud fe42bb3c56 create a new file swarm.go and move swarm part code from cluster.go into swarm.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 75a315d43e2577768ba5e0ef071ed9631e43ce8b
Component: engine
 2017-02-12 02:54:07 +08:00
allencloud 5257b3c3b3 create a new file networks.go and move network part codes from cluster.go into networks.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4f4151bba4eac6b6e4b47a922346fbf66120a057
Component: engine
 2017-02-12 02:50:17 +08:00
allencloud 767050f4bc create a new file task.go and move task part codes from cluster.go into tasks.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6be675c752ac511c7397fef5928af7dfda13a234
Component: engine
 2017-02-12 02:45:00 +08:00
allencloud b538436290 create a new file services.go and move service part codes from cluster.go into services.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6ff14b48c789fa9cad050b039b08f52491955ce2
Component: engine
 2017-02-12 02:43:23 +08:00
allencloud 6c9be69cc1 create a new file nodes.go and move node part codes from cluster.go into nodes.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7591e313a4799074cee45dab43f40b583a959abb
Component: engine
 2017-02-12 02:36:09 +08:00
allencloud 31a98bbb56 refactor helper.go and move getSecret to helper.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b6fb3a56dca43f33ddbb0b38a0fc0596c8c80b46
Component: engine
 2017-02-12 02:30:53 +08:00
Akihiro Suda 15ed05f7fc Merge pull request #30905 from allencloud/remove-redudant-code-in-unlock-and-better-error-msg 
remove redundant code and better error msg
Upstream-commit: 9a6ebf08e75c35a2041a18bcc6e0883021dc65b5
Component: engine
 2017-02-11 20:13:31 +09:00
Yong Tang b2b138d38f Ignore some functions in the Go template when header is rendered 
This fix ignore some functions in the Go template when header is
redendered, so that `--format "{{truncate .ID 1}}"` will still
be able to redener the header correctly.

Additional test cases have been added to the unit test.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8b165cad1aa8ce00ecc293ac0be82dd01392e548
Component: engine
 2017-02-10 19:34:50 -08:00
Yong Tang 5915ac4ad4 Allow --format to use different delim in table format 
This fix is an attempt to address
https://github.com/docker/docker/pull/28213#issuecomment-273840405

Currently when specify table format with table `--format "table {{.ID}}..."`,
the delimiter in the header section of the table is always `"\t"`.
That is actually different from the content of the table as the delimiter
could be anything (or even contatenated with `.`, for example):
```
$ docker service ps web --format 'table {{.Name}}.{{.ID}}' --no-trunc

NAME                ID
web.1.inyhxhvjcijl0hdbu8lgrwwh7
 \_ web.1.p9m4kx2srjqmfms4igam0uqlb
```

This fix is an attampt to address the skewness of the table when delimiter
is not `"\t"`.

The basic idea is that, when header consists of `table` key, the header section
will be redendered the same way as content section. A map mapping each
placeholder name to the HEADER entry name is used for the context of the header.

Unit tests have been updated and added to cover the changes.

This fix is related to #28313.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ea61dac9e6d04879445f9c34729055ac1bb15050
Component: engine
 2017-02-10 19:34:50 -08:00
allencloud fee80945cc remove redundant code and better error msg 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5c0ea56d56065ee737557650fa797a61f52e8378
Component: engine
 2017-02-11 09:22:07 +08:00
Yong Tang 97ab54822f Additional experimental features in non-experimental mode error handling 
This fix is the follow up of the last commit.
In this fix:
1. If any of the parents of a command has tags, then this command's
`Args` (Args validation func) will be wrapped up. The warpped up func
will check to see if the feature is supported or not. If it is not supported,
then a not supported message is generated instead.

This fix is related to 28626.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8421fc634907a68889b0f20c13b0cf135f0817c6
Component: engine
 2017-02-10 17:05:10 -08:00
Yong Tang 3662885f94 Improve error handling of experimental features in non-experimental mode 
This fix tries to address several issues raised in 28626 where
run against a non-experimental daemon may not generate correct
error message:
1. Incorrect flags were not checked against the supported features:
   ```
   $ docker stack --nonsense
   unknown flag: --nonsense
   ```
2. Subcommands were not checked against the supported features:
   ```
   $ docker stack ls
   Error response from daemon: This node is not a swarm manager...
   ```

This fix address the above mentioned issues by:
1. Add a pre-check for FlagErrorFunc
2. Recursively check if a feature is supported for cmd and its parents.

This fix fixes 28626.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9f6fea8e7bd3e64edab2bc5bac337b4118ea97df
Component: engine
 2017-02-10 16:54:19 -08:00
Yong Tang 08e260c901 Add --format to docker service ps 
This fix tries to address the issue raised in 27189 where
it is not possible to support configured formatting stored in
config.json.

Since `--format` was not supported in `docker service ps`,
the flag `--format` has also been added in this fix.

This fix
1. Add `--format` to `docker service ps`
2. Add `tasksFormat` to config.json
3. Add `--format` to `docker stack ps`
4. Add `--format` to `docker node ps`

The related docs has been updated.

An integration test has been added.

This fix fixes 27189.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f8c7c921d905615acf1d2c6577ae1cfb4600bec0
Component: engine
 2017-02-10 16:53:04 -08:00
Sebastiaan van Stijn fde87ec134 Merge pull request #30889 from aaronlehmann/addreference-tag-digest 
reference: Handle combination of tag and digest in AddReference
Upstream-commit: 584e399d9632200e6c8a636339c8aa6347a57fca
Component: engine
 2017-02-10 13:27:12 -08:00
Dmitry Shyshkin a02b030327 Fix #303111: dockerd leaks ExecIds on failed exec -i 
Signed-off-by: Dmitry Shyshkin <dmitry@shyshkin.org.ua>
Upstream-commit: 3cc0d6bb0475551687d89e7925b09f864c866a71
Component: engine
 2017-02-10 21:13:00 +02:00
Brian Goff 229ad1c063 Merge pull request #30903 from allencloud/remove-unused-headers-in-secret-create 
remove unused headers in secret_create.go
Upstream-commit: be6481041df951e75d079fde68fd8536c309dab2
Component: engine
 2017-02-10 14:10:31 -05:00
Sebastiaan van Stijn a0d5e6c8ea Merge pull request #30839 from yongtang/02082017-swarmkit-update 
Update SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2
Upstream-commit: 1eb284133451a85725d51935572267b6e83bd339
Component: engine
 2017-02-10 10:14:30 -08:00
Brian Goff cee0fd1068 Merge pull request #30901 from xulike666/fight-for-readability 
Fix some easy typos in cmd/* :D
Upstream-commit: 69be892c9d417a32d94235d0b111699c7df4d4ed
Component: engine
 2017-02-10 13:09:25 -05:00
Misty Stanley-Jones 796599868e Merge pull request #29559 from mstanleyjones/define_bridge 
Define bridge networks
Upstream-commit: c621fbce04ec845d5f9254bc59b11dfe06fff0e0
Component: engine
 2017-02-10 09:25:29 -08:00
Daniel Nephin 768202d8c3 Use 2 seconds instead of 2000 milliseconds 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: cbf2f4d2816b20df307a270d4267557618708c3f
Component: engine
 2017-02-10 11:30:07 -05:00
allencloud 434f430a26 split docker_api_swarm_test.go into multiple files 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 69afd30444e87b3d0c4fe1ed4079466f629b0c33
Component: engine
 2017-02-11 00:18:01 +08:00
allencloud 439a3c18ed add link query in container rm api doc 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 2972b99f1b0c615d5a6e3ee1645ed104cfb8fe94
Component: engine
 2017-02-11 00:17:37 +08:00
allencloud 46de6776e3 remove unused headers in secret_create.go 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 31d9ce6f5c6afed4d76ee70533871944b754e869
Component: engine
 2017-02-11 00:16:48 +08:00
Brian Goff 355bed80d8 Merge pull request #30896 from Microsoft/jjh/emitcommit 
Windows: make.ps1 emit commit ID
Upstream-commit: bade08a0637faebda4642cbe03185a461830cbff
Component: engine
 2017-02-10 09:56:02 -05:00
Justin Cormack dad963ca8c Merge pull request #30893 from Microsoft/jjh/disabletesttemporarily 
Windows: Temporarily disable TestBuildLastModified
Upstream-commit: eaffb3099a4ed2701fc0934b39b7dcdd1ca62219
Component: engine
 2017-02-10 11:38:56 +00:00