Commit Graph

202 Commits

Author SHA1 Message Date
c0453187a0 Merge pull request #28088 from aluzzardi/service-ps-task-resolution
service ps: Truncate Task IDs
Upstream-commit: 3f839084b0
Component: cli
2016-11-08 17:44:15 -08:00
be2c97f102 Merge pull request #27567 from yongtang/24391-dns-setting
Add custom DNS settings to service definition
Upstream-commit: f0c8571e5f
Component: cli
2016-11-08 17:43:00 -08:00
a0d17c1ef5 service ps: Truncate Task IDs
- Refactored to move resolution code into the idresolver
- Made `ps` output more bearable by shortening service IDs in task names

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 5834d378e0
Component: cli
2016-11-08 16:17:15 -08:00
a0661a2e11 Merge pull request #27992 from Microsoft/jjh/minapitoinfo
Adds `MinAPIVersion` to docker version
Upstream-commit: 086c47f5ee
Component: cli
2016-11-08 15:49:33 -08:00
1c91091ad7 Add custom DNS settings to service update
This fix adds `--dns-add`, `--dns-rm`, `--dns-opt-add`, `--dns-opt-rm`,
`--dns-search-add` and `--dns-search-rm` to `service update`.

An integration test and a unit test have been added to cover the changes in this fix.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 49e528e18a
Component: cli
2016-11-08 15:41:32 -08:00
e9737d7202 Add custom DNS settings to service definition
This fix tries to fix the issue raised in 24391 about allowing
custom DNS settings to service definition.

This fix adds `DNSConfig` (`Nameservers`, `Options`, `Search`) to
service definition, as well as `--dns`, `--dns-opt`, and `dns-search`
to `service create`.

An integration test has been added to cover the changes in this fix.

This fix fixes 24391.

A PR in swarmkit will be created separately.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f40b12d0f7
Component: cli
2016-11-08 15:41:32 -08:00
3504a807b2 Merge pull request #28142 from vieux/plugin_install_args
support settings in docker plugins install
Upstream-commit: a3d806f0bb
Component: cli
2016-11-08 15:05:39 -08:00
6e1ba7621a Merge pull request #28147 from yongtang/27567-service-update-docs-plural-form
Change to plural forms for help output of `docker service update`
Upstream-commit: 772dfcbeb1
Component: cli
2016-11-08 11:14:40 -08:00
10781d5340 Merge pull request #27710 from allencloud/show-num-for-global-service-in-service-ls
support show numbers of global service in service ls command
Upstream-commit: b04bb19101
Component: cli
2016-11-08 18:43:53 +01:00
36d1732f95 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>
Upstream-commit: af8ebf69db
Component: cli
2016-11-08 05:53:56 -08:00
7892a4e960 Merge pull request #28157 from yuexiao-wang/update-checkpoint
Update for docker checkpoint
Upstream-commit: c82d5e3c56
Component: cli
2016-11-08 22:36:22 +09:00
82c7b8040e Merge pull request #28153 from YuPengZTE/devCtx
context.Context should be the first parameter of a function
Upstream-commit: 544b21fb65
Component: cli
2016-11-08 12:40:32 +01:00
9670705c94 Update for docker checkpoint
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: cd2269a456
Component: cli
2016-11-08 16:56:29 +08:00
a01a81cf98 Merge pull request #28117 from ping035627/ping035627-patch-1107
Modify to improve code readability
Upstream-commit: 6edfb7558f
Component: cli
2016-11-08 09:44:45 +01:00
66ece30c85 support show numbers of global service in service ls command
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 7891d349b3
Component: cli
2016-11-08 16:17:15 +08:00
4cd3911d13 context.Context should be the first parameter of a function
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 7113bbf2c6
Component: cli
2016-11-08 14:51:17 +08:00
89bd4a499a support settings in docker plugins install
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 41513e3051
Component: cli
2016-11-07 22:49:22 -08:00
ffad23ed73 Adds minimum API version to version
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 089b33edd8
Component: cli
2016-11-07 21:20:00 -08:00
1fe9a67a27 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>
Upstream-commit: 3baa727ed1
Component: cli
2016-11-07 16:42:32 -08:00
8408e69f91 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>
Upstream-commit: 713c7cd81e
Component: cli
2016-11-08 08:37:44 +08:00
d7a0039133 Merge pull request #28029 from tealtail/27994-add-service-ls-truncate-opt
remove COMMAND column from `service ls` output. closes #27994
Upstream-commit: 6780c318a3
Component: cli
2016-11-07 14:39:16 -08:00
00e143bdae Merge pull request #25974 from kunalkushwaha/mount-add
correct handling of volumes while service update.
Upstream-commit: 7a50218855
Component: cli
2016-11-07 10:34:22 -08:00
cd9759a86e Merge pull request #25983 from jhorwit2/jah/ps-refactor
Add -a option to service/node ps
Upstream-commit: dd33c288ec
Component: cli
2016-11-07 17:33:10 +01:00
3c2e5c3d64 remove COMMAND column from service ls output. closes #27994
Signed-off-by: Alicia Lauerman <alicia@eta.im>
Upstream-commit: 1491ae50e0
Component: cli
2016-11-06 13:32:44 -05:00
0ee62b4e2a Add -a option to service/node ps
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: 21096cfc05
Component: cli
2016-11-06 07:40:39 -05:00
a5f114fa85 Merge pull request #28010 from vieux/fix_experimental_client
always add but hide experimental cmds and flags
Upstream-commit: db706f3c38
Component: cli
2016-11-04 13:49:19 -07:00
75f0b0b043 update cobra and use Tags
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 1e10649f55
Component: cli
2016-11-04 12:04:14 -07:00
a3b971ce93 cli/info: fix seccomp warning
also reword seccomp warning around default seccomp profile

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: b338ab7c41
Component: cli
2016-11-04 19:25:51 +01:00
9739850eeb 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>
Upstream-commit: 1cab3b32a6
Component: cli
2016-11-04 09:43:10 -07:00
21ad2b2908 Merge pull request #26276 from runcom/seccomp-conf
daemon: add a flag to override the default seccomp profile
Upstream-commit: 4758d72fa3
Component: cli
2016-11-04 15:45:30 +00:00
2584223dc2 Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2
Adding the hostname option to docker service command
Upstream-commit: 38a582f54c
Component: cli
2016-11-04 15:22:55 +01:00
b55edf2aaf Merge pull request #28045 from vincentbernat/fix/inspect-short-description
cli: shorten description of "inspect" subcommand
Upstream-commit: 36e659c019
Component: cli
2016-11-04 08:15:49 +01:00
3e2986789f 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>
Upstream-commit: b8cf9a880e
Component: cli
2016-11-04 10:15:18 +09:00
25608ce8d4 always add but hide experimental cmds and flags
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: eb522dac24
Component: cli
2016-11-03 17:31:12 -07:00
40f9852dd3 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>
Upstream-commit: 0e6f4e7cda
Component: cli
2016-11-03 20:46:28 +01:00
a3d3423005 fix double [y/N] in container prune
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 3014d36cd9
Component: cli
2016-11-03 10:33:17 -07:00
7e77a4eb36 Merge pull request #27910 from dperny/node_ip_in_raft
Auto-detect node IP address 
Upstream-commit: 938d24ab51
Component: cli
2016-11-03 10:30:55 -07:00
4e0dd7ba31 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>
Upstream-commit: 2cd4028024
Component: cli
2016-11-03 08:10:14 -07:00
4a8233909f Merge pull request #27934 from yuexiao-wang/volume-create
Update descriptions for the docker volume sub-command, such as  create,list and inspect
Upstream-commit: ee42b42f3c
Component: cli
2016-11-03 03:12:10 -07:00
f4a9cbc8ae Update for docker volume create
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 816560ffe9
Component: cli
2016-11-03 22:40:04 +08:00
2cef813aa2 Adding the hostname option to docker service command
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net>
Upstream-commit: 19b7bc1739
Component: cli
2016-11-03 10:02:14 +00:00
01e1a7306e cli: add --mount to docker run
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 51cb4aa7b8
Component: cli
2016-11-03 07:08:59 +00:00
a513733757 Merge pull request #27979 from allencloud/more-specific-in-service-scale-description
add replicated in service scale command description
Upstream-commit: e279ecacc5
Component: cli
2016-11-02 18:01:59 -07:00
e35c329385 daemon: add a flag to override the default seccomp profile
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 557db1ea68
Component: cli
2016-11-02 21:41:29 +01:00
5da8376ad1 node rm can be applied on not only active node
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 503053819e
Component: cli
2016-11-02 17:22:04 +08:00
ba2bdb1e37 add replicated in service scale command description
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 39e34ed1a3
Component: cli
2016-11-02 16:15:57 +08:00
7caa97e5c7 Merge pull request #27948 from WeiZhang555/consistent-filters
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: 81e6e5e36d
Component: cli
2016-11-02 00:53:15 -07:00
59572d8cbb Merge pull request #27942 from yuexiao-wang/remove-const
Remove some redundant consts
Upstream-commit: d4f4ad0ee4
Component: cli
2016-11-01 20:43:50 -07:00
cf21756a82 Remove some redundant consts
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 3acdab83fb
Component: cli
2016-11-02 16:42:42 +08:00
bee99c14d9 Merge pull request #27864 from vdemeester/add-statsformat-to-configfile
Add StatsFormat to the config.json file
Upstream-commit: 63719e1a24
Component: cli
2016-11-01 20:32:13 -07:00