Victor Vieux
a0661a2e11
Merge pull request #27992 from Microsoft/jjh/minapitoinfo
...
Adds `MinAPIVersion` to docker version
Upstream-commit: 086c47f5ee
2016-11-08 15:49:33 -08:00
Tibor Vass
3504a807b2
Merge pull request #28142 from vieux/plugin_install_args
...
support settings in docker plugins install
Upstream-commit: a3d806f0bb
2016-11-08 15:05:39 -08:00
Victor Vieux
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
2016-11-08 11:14:40 -08:00
Vincent Demeester
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
2016-11-08 18:43:53 +01:00
Yong Tang
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
2016-11-08 05:53:56 -08:00
Akihiro Suda
7892a4e960
Merge pull request #28157 from yuexiao-wang/update-checkpoint
...
Update for docker checkpoint
Upstream-commit: c82d5e3c56
2016-11-08 22:36:22 +09:00
Vincent Demeester
82c7b8040e
Merge pull request #28153 from YuPengZTE/devCtx
...
context.Context should be the first parameter of a function
Upstream-commit: 544b21fb65
2016-11-08 12:40:32 +01:00
yuexiao-wang
9670705c94
Update for docker checkpoint
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cd2269a456
2016-11-08 16:56:29 +08:00
Sebastiaan van Stijn
a01a81cf98
Merge pull request #28117 from ping035627/ping035627-patch-1107
...
Modify to improve code readability
Upstream-commit: 6edfb7558f
2016-11-08 09:44:45 +01:00
allencloud
66ece30c85
support show numbers of global service in service ls command
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 7891d349b3
2016-11-08 16:17:15 +08:00
yupeng
4cd3911d13
context.Context should be the first parameter of a function
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 7113bbf2c6
2016-11-08 14:51:17 +08:00
Victor Vieux
89bd4a499a
support settings in docker plugins install
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 41513e3051
2016-11-07 22:49:22 -08:00
John Howard
ffad23ed73
Adds minimum API version to version
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 089b33edd8
2016-11-07 21:20:00 -08:00
Yong Tang
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
2016-11-07 16:42:32 -08:00
WangPing
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
2016-11-08 08:37:44 +08:00
Misty Stanley-Jones
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
2016-11-07 14:39:16 -08:00
Aaron Lehmann
00e143bdae
Merge pull request #25974 from kunalkushwaha/mount-add
...
correct handling of volumes while service update.
Upstream-commit: 7a50218855
2016-11-07 10:34:22 -08:00
Vincent Demeester
cd9759a86e
Merge pull request #25983 from jhorwit2/jah/ps-refactor
...
Add -a option to service/node ps
Upstream-commit: dd33c288ec
2016-11-07 17:33:10 +01:00
Alicia Lauerman
3c2e5c3d64
remove COMMAND column from service ls output. closes #27994
...
Signed-off-by: Alicia Lauerman <alicia@eta.im >
Upstream-commit: 1491ae50e0
2016-11-06 13:32:44 -05:00
Josh Horwitz
0ee62b4e2a
Add -a option to service/node ps
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: 21096cfc05
2016-11-06 07:40:39 -05:00
Victor Vieux
a5f114fa85
Merge pull request #28010 from vieux/fix_experimental_client
...
always add but hide experimental cmds and flags
Upstream-commit: db706f3c38
2016-11-04 13:49:19 -07:00
Victor Vieux
75f0b0b043
update cobra and use Tags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 1e10649f55
2016-11-04 12:04:14 -07:00
Antonio Murdaca
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
2016-11-04 19:25:51 +01:00
Yong Tang
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
2016-11-04 09:43:10 -07:00
Justin Cormack
21ad2b2908
Merge pull request #26276 from runcom/seccomp-conf
...
daemon: add a flag to override the default seccomp profile
Upstream-commit: 4758d72fa3
2016-11-04 15:45:30 +00:00
Vincent Demeester
2584223dc2
Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2
...
Adding the hostname option to docker service command
Upstream-commit: 38a582f54c
2016-11-04 15:22:55 +01:00
Vincent Demeester
b55edf2aaf
Merge pull request #28045 from vincentbernat/fix/inspect-short-description
...
cli: shorten description of "inspect" subcommand
Upstream-commit: 36e659c019
2016-11-04 08:15:49 +01:00
Kunal Kushwaha
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
2016-11-04 10:15:18 +09:00
Victor Vieux
25608ce8d4
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eb522dac24
2016-11-03 17:31:12 -07:00
Sebastiaan van Stijn
2d55d48a71
Merge pull request #28021 from YuPengZTE/devString
...
Add “” for String
Upstream-commit: 284e11ba2b
2016-11-03 17:03:56 -07:00
Vincent Bernat
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
2016-11-03 20:46:28 +01:00
Victor Vieux
a3d3423005
fix double [y/N] in container prune
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 3014d36cd9
2016-11-03 10:33:17 -07:00
Sebastiaan van Stijn
7e77a4eb36
Merge pull request #27910 from dperny/node_ip_in_raft
...
Auto-detect node IP address
Upstream-commit: 938d24ab51
2016-11-03 10:30:55 -07:00
Drew Erny
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
2016-11-03 08:10:14 -07:00
Vincent Demeester
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
2016-11-03 03:12:10 -07:00
yuexiao-wang
f4a9cbc8ae
Update for docker volume create
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 816560ffe9
2016-11-03 22:40:04 +08:00
Nikolay Milovanov
2cef813aa2
Adding the hostname option to docker service command
...
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net >
Upstream-commit: 19b7bc1739
2016-11-03 10:02:14 +00:00
yupeng
9e5c08ce2b
Add for String
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: cd46f06934
2016-11-03 16:15:26 +08:00
Akihiro Suda
01e1a7306e
cli: add --mount to docker run
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 51cb4aa7b8
2016-11-03 07:08:59 +00:00
Sebastiaan van Stijn
a513733757
Merge pull request #27979 from allencloud/more-specific-in-service-scale-description
...
add replicated in service scale command description
Upstream-commit: e279ecacc5
2016-11-02 18:01:59 -07:00
Antonio Murdaca
e35c329385
daemon: add a flag to override the default seccomp profile
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 557db1ea68
2016-11-02 21:41:29 +01:00
allencloud
5da8376ad1
node rm can be applied on not only active node
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 503053819e
2016-11-02 17:22:04 +08:00
allencloud
ba2bdb1e37
add replicated in service scale command description
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 39e34ed1a3
2016-11-02 16:15:57 +08:00
Sebastiaan van Stijn
7caa97e5c7
Merge pull request #27948 from WeiZhang555/consistent-filters
...
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: 81e6e5e36d
2016-11-02 00:53:15 -07:00
Sebastiaan van Stijn
59572d8cbb
Merge pull request #27942 from yuexiao-wang/remove-const
...
Remove some redundant consts
Upstream-commit: d4f4ad0ee4
2016-11-01 20:43:50 -07:00
yuexiao-wang
cf21756a82
Remove some redundant consts
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 3acdab83fb
2016-11-02 16:42:42 +08:00
Sebastiaan van Stijn
bee99c14d9
Merge pull request #27864 from vdemeester/add-statsformat-to-configfile
...
Add StatsFormat to the config.json file
Upstream-commit: 63719e1a24
2016-11-01 20:32:13 -07:00
Michael Crosby
bb91eece7d
Merge pull request #27953 from thaJeztah/fix-deprecation-version
...
Update deprecation versions for "email" and colon in "security options"
Upstream-commit: 3a5d54290d
2016-11-01 14:31:32 -07:00
Michael Crosby
951b0a97af
Merge pull request #22641 from cpuguy83/build_finalization
...
Adds ability to flatten image after build
Upstream-commit: 09caa1ae97
2016-11-01 14:30:18 -07:00
Brian Goff
fad42b5770
Adds ability to squash image after build
...
Allow built images to be squash to scratch.
Squashing does not destroy any images or layers, and preserves the
build cache.
Introduce a new CLI argument --squash to docker build
Introduce a new param to the build API endpoint `squash`
Once the build is complete, docker creates a new image loading the diffs
from each layer into a single new layer and references all the parent's
layers.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b90c048804
2016-11-01 13:41:59 -04:00
Victor Vieux
Tibor Vass
Vincent Demeester
Yong Tang
Akihiro Suda
yuexiao-wang
Sebastiaan van Stijn
allencloud
yupeng
Victor Vieux
John Howard
WangPing
Misty Stanley-Jones
Aaron Lehmann
Alicia Lauerman
Josh Horwitz
Antonio Murdaca
Justin Cormack
Kunal Kushwaha
Vincent Bernat
Drew Erny
Nikolay Milovanov
Michael Crosby
Brian Goff