toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
306 Commits 3 Branches 295 Tags
4ae7176ffb8d37c60d2152fb155678e659af5b99
Commit Graph
306 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Vieux 4ae7176ffb always add but hide experimental cmds and flags 
Signed-off-by: Victor Vieux <vieux@docker.com>

update cobra and use Tags

Signed-off-by: Victor Vieux <vieux@docker.com>

allow client to talk to an older server

Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-08 04:55:27 -08:00
Victor Vieux 086c47f5ee Merge pull request #27992 from Microsoft/jjh/minapitoinfo 
Adds `MinAPIVersion` to docker version
 2016-11-08 15:49:33 -08:00
Tibor Vass a3d806f0bb Merge pull request #28142 from vieux/plugin_install_args 
support settings in docker plugins install
 2016-11-08 15:05:39 -08:00
Victor Vieux 772dfcbeb1 Merge pull request #28147 from yongtang/27567-service-update-docs-plural-form 
Change to plural forms for help output of `docker service update`
 2016-11-08 11:14:40 -08:00
Vincent Demeester b04bb19101 Merge pull request #27710 from allencloud/show-num-for-global-service-in-service-ls 
support show numbers of global service in service ls command
 2016-11-08 18:43:53 +01:00
Yong Tang af8ebf69db Change to plural forms for help output of docker service update 
This fix is based on the comment in
https://github.com/docker/docker/pull/27567#discussion_r86910604

Basically, in the help output of `docker service update`, the `--xxx-add`
flags typically have plural forms while `--xxx-rm` flags have singular
forms.

This fix updates the help output for consistency.

This fix also updates the related docs in `service_update.md`.
The help output in `service_update.md` has been quite out-of-sync
with the actual output so this fix replaces the output with the
most up-to-date output.

This fix is related to #27567.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-08 05:53:56 -08:00
Akihiro Suda c82d5e3c56 Merge pull request #28157 from yuexiao-wang/update-checkpoint 
Update for docker checkpoint
 2016-11-08 22:36:22 +09:00
Vincent Demeester 544b21fb65 Merge pull request #28153 from YuPengZTE/devCtx 
context.Context should be the first parameter of a function
 2016-11-08 12:40:32 +01:00
yuexiao-wang cd2269a456 Update for docker checkpoint 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-08 16:56:29 +08:00
Sebastiaan van Stijn 6edfb7558f Merge pull request #28117 from ping035627/ping035627-patch-1107 
Modify to improve code readability
 2016-11-08 09:44:45 +01:00
allencloud 7891d349b3 support show numbers of global service in service ls command 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-08 16:17:15 +08:00
yupeng 7113bbf2c6 context.Context should be the first parameter of a function 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-08 14:51:17 +08:00
Victor Vieux 41513e3051 support settings in docker plugins install 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-07 22:49:22 -08:00
John Howard 089b33edd8 Adds minimum API version to version 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-07 21:20:00 -08:00
Yong Tang 3baa727ed1 Add --tty to docker service create/update 
This fix tries to add `--tty` to `docker service create/update`. As was
specified in 25644, `TTY` flag has been added to SwarmKit and is
already vendored.

This fix add `--tty` to `docker service create/update`.

Related document has been updated.

Additional integration tests has been added.

This fix fixes 25644.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-07 16:42:32 -08:00
WangPing 713c7cd81e modify to improve code readability 
Signed-off-by: WangPing <present.wp@icloud.com>

align

Signed-off-by: WangPing <present.wp@icloud.com>

align

Signed-off-by: WangPing <present.wp@icloud.com>
 2016-11-08 08:37:44 +08:00
Misty Stanley-Jones 6780c318a3 Merge pull request #28029 from tealtail/27994-add-service-ls-truncate-opt 
remove COMMAND column from `service ls` output. closes #27994
 2016-11-07 14:39:16 -08:00
Aaron Lehmann 7a50218855 Merge pull request #25974 from kunalkushwaha/mount-add 
correct handling of volumes while service update.
 2016-11-07 10:34:22 -08:00
Vincent Demeester dd33c288ec Merge pull request #25983 from jhorwit2/jah/ps-refactor 
Add -a option to service/node ps
 2016-11-07 17:33:10 +01:00
Alicia Lauerman 1491ae50e0 remove COMMAND column from service ls output. closes #27994 
Signed-off-by: Alicia Lauerman <alicia@eta.im>
 2016-11-06 13:32:44 -05:00
Josh Horwitz 21096cfc05 Add -a option to service/node ps 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
 2016-11-06 07:40:39 -05:00
Victor Vieux db706f3c38 Merge pull request #28010 from vieux/fix_experimental_client 
always add but hide experimental cmds and flags
 2016-11-04 13:49:19 -07:00
Victor Vieux 1e10649f55 update cobra and use Tags 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-04 12:04:14 -07:00
Antonio Murdaca b338ab7c41 cli/info: fix seccomp warning 
also reword seccomp warning around default seccomp profile

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-04 19:25:51 +01:00
Yong Tang 1cab3b32a6 Add --cpus flag to control cpu resources 
This fix tries to address the proposal raised in 27921 and add
`--cpus` flag for `docker run/create`.

Basically, `--cpus` will allow user to specify a number (possibly partial)
about how many CPUs the container will use. For example, on a 2-CPU system
`--cpus 1.5` means the container will take 75% (1.5/2) of the CPU share.

This fix adds a `NanoCPUs` field to `HostConfig` since swarmkit alreay
have a concept of NanoCPUs for tasks. The `--cpus` flag will translate
the number into reused `NanoCPUs` to be consistent.

This fix adds integration tests to cover the changes.

Related docs (`docker run` and Remote APIs) have been updated.

This fix fixes 27921.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-04 09:43:10 -07:00
Justin Cormack 4758d72fa3 Merge pull request #26276 from runcom/seccomp-conf 
daemon: add a flag to override the default seccomp profile
 2016-11-04 15:45:30 +00:00
Vincent Demeester 38a582f54c Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2 
Adding the hostname option to docker service command
 2016-11-04 15:22:55 +01:00
Vincent Demeester 36e659c019 Merge pull request #28045 from vincentbernat/fix/inspect-short-description 
cli: shorten description of "inspect" subcommand
 2016-11-04 08:15:49 +01:00
Kunal Kushwaha b8cf9a880e correct handling of volumes while service update. 
Updating a service to replace a volume is handled properly now.
Fixes bug#25772

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2016-11-04 10:15:18 +09:00
Victor Vieux eb522dac24 always add but hide experimental cmds and flags 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-03 17:31:12 -07:00
Sebastiaan van Stijn 284e11ba2b Merge pull request #28021 from YuPengZTE/devString 
Add “” for String
 2016-11-03 17:03:56 -07:00
Vincent Bernat 0e6f4e7cda cli: shorten description of "inspect" subcommand 
The short description should be kept short. Spanning on several lines is
a bit ugly. A user can still get more information in the manual or we
can expand the long description instead if we want (there is currently
none).

This reverts a bit of #26683.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
 2016-11-03 20:46:28 +01:00
Victor Vieux 3014d36cd9 fix double [y/N] in container prune 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-03 10:33:17 -07:00
Sebastiaan van Stijn 938d24ab51 Merge pull request #27910 from dperny/node_ip_in_raft 
Auto-detect node IP address
 2016-11-03 10:30:55 -07:00
Drew Erny 2cd4028024 added node ip autodetection 
Manager now auto-detects the address that an agent connects to the cluster
from and stores it. This is useful for many kinds of internal cluster
management tools.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2016-11-03 08:10:14 -07:00
Vincent Demeester ee42b42f3c Merge pull request #27934 from yuexiao-wang/volume-create 
Update descriptions for the docker volume sub-command, such as  create，list and inspect
 2016-11-03 03:12:10 -07:00
yuexiao-wang 816560ffe9 Update for docker volume create 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-03 22:40:04 +08:00
Nikolay Milovanov 19b7bc1739 Adding the hostname option to docker service command 
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net>
 2016-11-03 10:02:14 +00:00
yupeng cd46f06934 Add for String 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-03 16:15:26 +08:00
Akihiro Suda 51cb4aa7b8 cli: add --mount to docker run 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-11-03 07:08:59 +00:00
Sebastiaan van Stijn e279ecacc5 Merge pull request #27979 from allencloud/more-specific-in-service-scale-description 
add replicated in service scale command description
 2016-11-02 18:01:59 -07:00
Antonio Murdaca 557db1ea68 daemon: add a flag to override the default seccomp profile 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-02 21:41:29 +01:00
allencloud 503053819e node rm can be applied on not only active node 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-02 17:22:04 +08:00
allencloud 39e34ed1a3 add replicated in service scale command description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-02 16:15:57 +08:00
Sebastiaan van Stijn 81e6e5e36d Merge pull request #27948 from WeiZhang555/consistent-filters 
Replace all "Filter" field with "Filters" for consistency
 2016-11-02 00:53:15 -07:00
Sebastiaan van Stijn d4f4ad0ee4 Merge pull request #27942 from yuexiao-wang/remove-const 
Remove some redundant consts
 2016-11-01 20:43:50 -07:00
yuexiao-wang 3acdab83fb Remove some redundant consts 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-02 16:42:42 +08:00
Sebastiaan van Stijn 63719e1a24 Merge pull request #27864 from vdemeester/add-statsformat-to-configfile 
Add StatsFormat to the config.json file
 2016-11-01 20:32:13 -07:00
Michael Crosby 3a5d54290d Merge pull request #27953 from thaJeztah/fix-deprecation-version 
Update deprecation versions for "email" and colon in "security options"
 2016-11-01 14:31:32 -07:00
Michael Crosby 09caa1ae97 Merge pull request #22641 from cpuguy83/build_finalization 
Adds ability to flatten image after build
 2016-11-01 14:30:18 -07:00