Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,371 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

9371 Commits

Author SHA1 Message Date
Aaron Lehmann 8a379d7bce api: Hide UpdateStatus when it is not present 
When UpdateStatus was not present, the empty values of the timestamps
would be present:

        "UpdateStatus": {
            "StartedAt": "0001-01-01T00:00:00Z",
            "CompletedAt": "0001-01-01T00:00:00Z"
        }

To fix this, make the timestamps pointers, so they can be set to nil
when they should not be shown.

Also make UpdateStatus itself a pointer, so an empty object does not
show up when there is no UpdateStatus.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-01 15:08:41 -08:00
Yong Tang 312958f4db Allow `docker plugin inspect` to search based on ID or name 
This fix tries to address the issue raised in discussion of
PR 28735 where it was not possible to manage plugin based on
plugin ID. Previously it was not possible to invoke
`docker plugin inspect` with a plugin ID (or ID prefix).

This fix updates the implementation of `docker plugin inspect`
so that it is possbile to search based on a plugin name, or a
plugin ID. A short format of plugin ID (prefix) is also possible,
as long as there is no ambiguity.

Previously the check of `docker plugin inspect` was mostly done
on the client side. This could potentially cause inconsistency
between API and CMD. This fix move all the checks to daemon side
so that API and CMD will be consistent.

An integration test has been added to cover the changes.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-12-01 10:44:17 -08:00
Jake Sanders c84b90291c Add registry-specific credential helper support 
Signed-off-by: Jake Sanders <jsand@google.com>
 2016-12-01 10:29:00 -08:00
Sebastiaan van Stijn f11c4529cb Merge pull request #29026 from yuexiao-wang/fix-client-test 
Optimize the log info for client test
 2016-12-01 16:30:07 +01:00
yuexiao-wang 7673aad223 Fix the inconsistent function name for client 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-02 04:18:02 +08:00
yuexiao-wang 9a9c077e63 Optimize the log info for client test 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-02 03:32:04 +08:00
Sebastiaan van Stijn ebd8ec6c3f Merge pull request #28922 from yuexiao-wang/fix-secret 
Fix the inconsistency for secret ls and secrect rm
 2016-12-01 11:29:58 +01:00
yuexiao-wang cd79095c81 Fix the use for secret create 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-01 19:48:33 +08:00
Alexander Morozov d94d204f97 Merge pull request #28885 from vdemeester/revert-service-ps-all 
Revert "Add -a option to service/node ps"
 2016-11-30 12:02:34 -08:00
yuexiao-wang 7a9e414988 Fix the inconsistency for docker secret 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-30 17:23:39 +08:00
Victor Vieux d3411b7a70 Merge pull request #28876 from vdemeester/28835-better-handling-of-external-networks 
stack deploy: handle external network when deploying
 2016-11-29 15:00:35 -08:00
Vincent Demeester 9ab6d420b9 Merge pull request #28919 from allencloud/change-secret-remove-in-cli 
change secret remove logic in cli
 2016-11-29 15:08:24 +01:00
Vincent Demeester b82f2ce501 Merge pull request #28874 from yuexiao-wang/fix-layer-typo 
Fix some typos
 2016-11-29 14:45:08 +01:00
yuexiao-wang 5e2a13b971 Fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-30 03:01:32 +08:00
Sebastiaan van Stijn dea82af0ea Merge pull request #28904 from dnephin/add-volume-labels-to-deploy 
Use namespace label on stack volumes
 2016-11-29 14:39:26 +01:00
Akihiro Suda 232944cc15 client: add accessor methods for client.customHTTPHeaders 
Added two methods:

 - *Client.CustomHTTPHeaders() map[string]string
 - *Client.SetCustomHTTPHeaders(headers map[string]string)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-11-29 09:02:52 +00:00
allencloud 0227275b7f change secret remove logic in cli 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-29 15:12:05 +08:00
Daniel Nephin 798c4a614e Use namespace label on stack volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-28 18:02:39 -05:00
Vincent Demeester 32f410cd35 Fixes ImageList to be retro-compatible with older API 
Make sure current client code can talk for ImageList can still talk to
older daemon.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 22:15:50 +01:00
John Howard a913891b7d Align output of docker version again 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-28 11:38:58 -08:00
Vincent Demeester 6ffb62368a Revert "Add -a option to service/node ps" 
This reverts commit 139fff2bf0ebe12b61871ba8ec8be8d51c2338db.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 18:08:45 +01:00
Vincent Demeester a0ce75c25d Merge pull request #28822 from yuexiao-wang/modify-plugin 
Modify repoName to PLUGIN for docker plugin create
 2016-11-28 17:52:04 +01:00
Vincent Demeester 8e63000bf3 stack deploy: handle external network when deploying 
If the network is marked as external, don't use the namespace on
it. Otherwise, it's not found.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 17:38:41 +01:00
Kei Ohmura 8feea86e0f fix description of 'docker swarm init' 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
 2016-11-28 13:24:02 +09:00
Antonio Murdaca a0f447d124 Merge pull request #28780 from vieux/accept_src_in_secret 
support src in --secret
 2016-11-26 14:34:30 +01:00
Vincent Demeester 60da1d9830 Merge pull request #28815 from dnephin/add-short-option 
Add a short flag for docker stack deploy
 2016-11-25 21:18:09 +01:00
Daniel Nephin 7b35599e2d Add a short flag for docker stack deploy 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-25 13:23:36 -05:00
yuexiao-wang 48537db849 Modify reponame to PLUGIN and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-25 23:09:46 +08:00
Daniel Nephin c40696023b Allow hostname to be updated on service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-24 15:44:35 -05:00
Yong Tang 961046c5a8 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>
 2016-11-24 08:14:36 -08:00
yuexiao-wang 7a89624bd5 Add options for docker plugin enable and fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-25 04:07:06 +08:00
Victor Vieux 7c957db8d2 Merge pull request #28773 from dnephin/exit-status 
exit with status 1 if help is called on an invalid command
 2016-11-23 15:13:29 -08:00
Victor Vieux dc5c8a7713 support src in --secret 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-23 14:30:57 -08:00
Vincent Demeester 36c919d313 Merge pull request #28675 from dnephin/no-swarmmode-error-on-deploy 
Better error message on stack deploy when not a swarm manager
 2016-11-23 22:47:13 +01:00
Daniel Nephin 004fc6b9e4 exit with status 1 if help is called on an invalid command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-23 15:13:58 -05:00
Daniel Nephin 7604609bed exit with status 1 if help is called on an invalid command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-23 15:13:58 -05:00
Daniel Nephin 5ead1cc490 Better error message on stack deploy against not a swarm. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-23 12:15:11 -05:00
erxian 0171a79c56 update secret command 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2016-11-23 10:07:09 -05:00
Victor Vieux d8787ecd81 Merge pull request #28716 from ehazlett/fix-multi-secret-inspect 
Update secret inspect to support IDs
 2016-11-22 17:39:48 -08:00
cyli 357cabef2d Do not display the digest or size of swarm secrets 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-22 18:13:27 -05:00
Sebastiaan van Stijn 36a1664cd4 Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs 
Prepare docs and Swagger definition for automatically generated API docs
 2016-11-22 22:47:38 +01:00
Evan Hazlett 46cd1fa87b 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>
 2016-11-22 16:01:16 -05:00
Tibor Vass e0ad93a836 Merge pull request #28595 from anusha-ragunathan/plugin_timeout 
Allow HTTP client timeout to be configurable on plugin enable.
 2016-11-22 10:17:10 -08:00
Tibor Vass 7cc80114de Merge pull request #28595 from anusha-ragunathan/plugin_timeout 
Allow HTTP client timeout to be configurable on plugin enable.
 2016-11-22 10:17:10 -08:00
Victor Vieux 4d87ef4432 Merge pull request #28529 from allencloud/update-secret-create-url 
fix secret create url for consistency
 2016-11-22 09:55:17 -08:00
Vincent Demeester 1318c8dcb4 Merge pull request #28445 from cpuguy83/28439_fix_client_rm_on_old_daemons 
Handle `run --rm` against older daemons on the cli
 2016-11-22 14:25:03 +01:00
Ben Firshman 9c9ae79e64 Rename Remote API to Engine API 
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-22 12:49:38 +00:00
Vincent Demeester 2a9b8737a5 Merge pull request #28651 from YuPengZTE/devMD002 
First header should be a top level header
 2016-11-22 13:11:37 +01:00
Vincent Demeester 7d0f584f54 Merge pull request #28659 from xuzhenglun/master 
bugfix: incorrect ErrConnectFailed Comparison
 2016-11-22 13:01:05 +01:00
Vincent Demeester 800c0e20ce Merge pull request #28659 from xuzhenglun/master 
bugfix: incorrect ErrConnectFailed Comparison
 2016-11-22 13:01:05 +01:00