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
458 Commits 12 Branches 296 Tags
1b0cf4eea1dabafcd3998bee7e035bb27eb259f8
Commit Graph

458 Commits

Author SHA1 Message Date
Vincent Demeester
1b0cf4eea1 Merge pull request #28919 from allencloud/change-secret-remove-in-cli 
change secret remove logic in cli
Upstream-commit: 9ab6d420b9
Component: cli
 2016-11-29 15:08:24 +01:00
Vincent Demeester
a712fa58db Merge pull request #28874 from yuexiao-wang/fix-layer-typo 
Fix some typos
Upstream-commit: b82f2ce501
Component: cli
 2016-11-29 14:45:08 +01:00
yuexiao-wang
b3d1ee086f Fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 5e2a13b971
Component: cli
 2016-11-30 03:01:32 +08:00
Sebastiaan van Stijn
8e3ea3e667 Merge pull request #28904 from dnephin/add-volume-labels-to-deploy 
Use namespace label on stack volumes
Upstream-commit: dea82af0ea
Component: cli
 2016-11-29 14:39:26 +01:00
allencloud
9d0522f784 change secret remove logic in cli 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0227275b7f
Component: cli
 2016-11-29 15:12:05 +08:00
Daniel Nephin
e387834219 Use namespace label on stack volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 798c4a614e
Component: cli
 2016-11-28 18:02:39 -05:00
John Howard
6ff3c5f368 Align output of docker version again 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a913891b7d
Component: cli
 2016-11-28 11:38:58 -08:00
Vincent Demeester
21bda2fa99 Merge pull request #28822 from yuexiao-wang/modify-plugin 
Modify repoName to PLUGIN for docker plugin create
Upstream-commit: a0ce75c25d
Component: cli
 2016-11-28 17:52:04 +01:00
Kei Ohmura
5c72df8bb5 fix description of 'docker swarm init' 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 8feea86e0f
Component: cli
 2016-11-28 13:24:02 +09:00
Antonio Murdaca
7cd5e53254 Merge pull request #28780 from vieux/accept_src_in_secret 
support src in --secret
Upstream-commit: a0f447d124
Component: cli
 2016-11-26 14:34:30 +01:00
Vincent Demeester
80335a35e2 Merge pull request #28815 from dnephin/add-short-option 
Add a short flag for docker stack deploy
Upstream-commit: 60da1d9830
Component: cli
 2016-11-25 21:18:09 +01:00
Daniel Nephin
2e594e381b Add a short flag for docker stack deploy 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7b35599e2d
Component: cli
 2016-11-25 13:23:36 -05:00
yuexiao-wang
eae5084f8a Modify reponame to PLUGIN and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 48537db849
Component: cli
 2016-11-25 23:09:46 +08:00
Daniel Nephin
527b0ad302 Allow hostname to be updated on service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c40696023b
Component: cli
 2016-11-24 15:44:35 -05:00
Yong Tang
3a6ac9f773 Update docs of docker network ls --filter 
Currently the help output of `docker network ls --filter` is:
```
Options:
  -f, --filter value   Provide filter values (i.e. 'dangling=true') (default [])
  ...
```
This caused confusion as only the following filters are supported at the moment:
 - `driver`
 - `type`
 - `name`
 - `id`
 - `label`

This fix update the help output of `docker network ls --filter` and `network_ls.md`.
The `dangling=true` description has been replace to:
```
Options:
  -f, --filter filter   Provide filter values (i.e. 'driver=bridge')
  ...
```

This fix fixes 28786.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 961046c5a8
Component: cli
 2016-11-24 08:14:36 -08:00
yuexiao-wang
95a1a461c6 Add options for docker plugin enable and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 7a89624bd5
Component: cli
 2016-11-25 04:07:06 +08:00
Victor Vieux
2d8129362d Merge pull request #28773 from dnephin/exit-status 
exit with status 1 if help is called on an invalid command
Upstream-commit: 7c957db8d2
Component: cli
 2016-11-23 15:13:29 -08:00
Victor Vieux
e2c24e804b support src in --secret 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: dc5c8a7713
Component: cli
 2016-11-23 14:30:57 -08:00
Vincent Demeester
f6cb3ad320 Merge pull request #28675 from dnephin/no-swarmmode-error-on-deploy 
Better error message on stack deploy when not a swarm manager
Upstream-commit: 36c919d313
Component: cli
 2016-11-23 22:47:13 +01:00
Daniel Nephin
d54f25b0fd exit with status 1 if help is called on an invalid command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7604609bed
Component: cli
 2016-11-23 15:13:58 -05:00
Daniel Nephin
6e1cc0ff7f Better error message on stack deploy against not a swarm. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5ead1cc490
Component: cli
 2016-11-23 12:15:11 -05:00
erxian
0b6a55655e update secret command 
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 0171a79c56
Component: cli
 2016-11-23 10:07:09 -05:00
Victor Vieux
334864b168 Merge pull request #28716 from ehazlett/fix-multi-secret-inspect 
Update secret inspect to support IDs
Upstream-commit: d8787ecd81
Component: cli
 2016-11-22 17:39:48 -08:00
cyli
0adbcb7fcf Do not display the digest or size of swarm secrets 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 357cabef2d
Component: cli
 2016-11-22 18:13:27 -05:00
Evan Hazlett
fa382861cb update secret inspect to support IDs 
This updates secret inspect to support inspect by ID in addition to name
as well as inspecting multiple secrets.  This also cleans up the
help text for consistency.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 46cd1fa87b
Component: cli
 2016-11-22 16:01:16 -05:00
Tibor Vass
4f19ac617e Merge pull request #28595 from anusha-ragunathan/plugin_timeout 
Allow HTTP client timeout to be configurable on plugin enable.
Upstream-commit: e0ad93a836
Component: cli
 2016-11-22 10:17:10 -08:00
Vincent Demeester
2b3cea2450 Merge pull request #28445 from cpuguy83/28439_fix_client_rm_on_old_daemons 
Handle `run --rm` against older daemons on the cli
Upstream-commit: 1318c8dcb4
Component: cli
 2016-11-22 14:25:03 +01:00
Vincent Demeester
5a845e573b Merge pull request #28659 from xuzhenglun/master 
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: 7d0f584f54
Component: cli
 2016-11-22 13:01:05 +01:00
Reficul
a08156a072 fix incorrect ErrConnectFailed comparison 
Signed-off-by: Reficul <xuzhenglun@gmail.com>
Upstream-commit: 14770269e8
Component: cli
 2016-11-22 10:42:55 +08:00
Brian Goff
e727185cfe Handle run --rm against older daemons on the cli 
For previous versions of Docker, `--rm` was handled client side, as such
there was no support in the daemon for it.
Now it is handled daemon side, but we still need to handle the case of a
newer client talking to an older daemon.

Falls back to client-side removal when the daemon does not support it.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 4632a029d9
Component: cli
 2016-11-21 20:39:04 -05:00
Victor Vieux
f85b33128a Merge pull request #28677 from dnephin/remove-deploy-experimental 
Move `docker stack` out of experimental
Upstream-commit: 23c399dd10
Component: cli
 2016-11-21 14:33:35 -08:00
Victor Vieux
38b13e5bfa Merge pull request #28328 from aaronlehmann/duration-opts 
cli: Add valid suffixes for remaining duration options
Upstream-commit: 07c896b18e
Component: cli
 2016-11-21 14:03:00 -08:00
Victor Vieux
977760d8eb Merge pull request #28504 from runcom/fix-info-route-secopt 
api: types: do not remove old SecurityOptions struct
Upstream-commit: 2d66496a2b
Component: cli
 2016-11-21 13:55:07 -08:00
Anusha Ragunathan
3374b2a4b4 Add HTTP client timeout. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 752a9a7c56
Component: cli
 2016-11-21 13:11:40 -08:00
Vincent Demeester
60606c230f Merge pull request #28556 from ehazlett/container-secret-store 
Fix target reference secrets and container secret store
Upstream-commit: 2d7ef04a57
Component: cli
 2016-11-21 21:40:01 +01:00
Daniel Nephin
bc199413c3 Move docker stack out of experimental 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e1b5bdd768
Component: cli
 2016-11-21 15:30:25 -05:00
Vincent Demeester
df30b2fb86 Do not panic if network is nil 
network is `nil` if the following case:

```
services:
  foo:
    image: nginx
    networks:
      mynetwork:
```

It's a valid compose so we should not panic.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2638cd6f3d
Component: cli
 2016-11-21 17:59:29 +01:00
Vincent Demeester
615421f56d Merge pull request #28539 from nishanttotla/pin-image-digest-ux 
Suppressing digest for docker service ls/ps
Upstream-commit: 89703a0196
Component: cli
 2016-11-21 14:06:37 +01:00
Vincent Demeester
7970861bba Merge pull request #28294 from vdemeester/compose-swarm-healthcheck 
Add support for healthcheck in compose to swarm
Upstream-commit: 4e343ae989
Component: cli
 2016-11-21 10:28:37 +01:00
Antonio Murdaca
4efd139636 api: types: keep info.SecurityOptions a string slice 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 123d33d81d
Component: cli
 2016-11-19 13:21:16 +01:00
Sebastiaan van Stijn
607719cae6 swap position of "host" and "ip" 
the service definition uses the format as defined
in  http://man7.org/linux/man-pages/man5/hosts.5.html
(IP_address canonical_hostname [aliases...])

This format is the _reverse_ of the format used in
the container API.

Commit f32869d956eb175f88fd0b16992d2377d8eae79c
inadvertently used the incorrect order.

This fixes the order, and correctly sets it to;

    IP-Address hostname

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 82804cc8e5
Component: cli
 2016-11-18 22:04:27 +01:00
Nishant Totla
71aa7e39fa Suppressing digest for docker service ls/ps 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 5f1209bf4b
Component: cli
 2016-11-18 09:39:34 -08:00
Aaron Lehmann
dee52b4790 Return warnings from service create and service update when digest pinning fails 
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.

This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: b866fa77f4
Component: cli
 2016-11-18 09:31:31 -08:00
Daniel Nephin
21435bb7d5 Default parallelism to 1. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c682f10a8f
Component: cli
 2016-11-18 16:17:08 +01:00
Vincent Demeester
98e2097ade Add support for healthcheck in composefile v3 
`docker stack deploy` now supports a composefile v3 format that have a
healthcheck.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e21f4f9996
Component: cli
 2016-11-18 15:09:13 +01:00
Vincent Demeester
6c5a8a992c Merge pull request #28354 from ripcurld00d/tag_creation 
Change the docker-tag usage text to be clearer
Upstream-commit: dd8712c634
Component: cli
 2016-11-18 13:02:40 +01:00
Boaz Shuster
bdac023521 Change the docker-tag usage text to be clearer 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: cc36bf62ef
Component: cli
 2016-11-18 10:34:02 +02:00
Michael Crosby
c539a33a54 Merge pull request #28347 from yongtang/28339-ignore-unkwnon-field-template 
Use `map[string]bool` for `preProcessor` to ignore unknown fields
Upstream-commit: e59facceb7
Component: cli
 2016-11-17 15:13:02 -08:00
Tõnis Tiigi
82ea944d4a Merge pull request #28554 from vieux/showhelp 
refactor help func in CLI
Upstream-commit: 4e4b58fbcb
Component: cli
 2016-11-17 14:27:26 -08:00
Evan Hazlett
fb2ded55b6 do not force target type for secret references 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

use secret store interface instead of embedded secret data into container

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: bc542f365c
Component: cli
 2016-11-17 15:49:02 -05:00