Victor Vieux
df125f380f
Merge pull request #27992 from Microsoft/jjh/minapitoinfo
...
Adds `MinAPIVersion` to docker version
Upstream-commit: 2d4203222574623b10d94817b9959a08698f516b
Component: engine
2016-11-08 15:49:33 -08:00
Tibor Vass
08da55efb1
Merge pull request #28142 from vieux/plugin_install_args
...
support settings in docker plugins install
Upstream-commit: c33fb1013d9a06c0efd5f29efa2aaa5a412476f2
Component: engine
2016-11-08 15:05:39 -08:00
Victor Vieux
05466ddbca
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: fb9aca312802870add3a88d45d7a1c45f7fab327
Component: engine
2016-11-08 11:14:40 -08:00
Vincent Demeester
5433abf008
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: a70b1d74a040e2c17bba1fe553ccbd293a64703a
Component: engine
2016-11-08 18:43:53 +01:00
Yong Tang
533d6e45ea
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: 1b42d9d0db4f1eadf0a70424ff829bb3346f7bd9
Component: engine
2016-11-08 05:53:56 -08:00
Akihiro Suda
988bfccd70
Merge pull request #28157 from yuexiao-wang/update-checkpoint
...
Update for docker checkpoint
Upstream-commit: cbc511720ab13bff05a66c9fa72f5354b2c7bc94
Component: engine
2016-11-08 22:36:22 +09:00
Vincent Demeester
032d1bd1bd
Merge pull request #28153 from YuPengZTE/devCtx
...
context.Context should be the first parameter of a function
Upstream-commit: ec221643587a6c22b7e0ab20087ce97100285fb9
Component: engine
2016-11-08 12:40:32 +01:00
yuexiao-wang
f95b21c73c
Update for docker checkpoint
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 90ce77e46a7d84ff801624e105b6c00749d3286c
Component: engine
2016-11-08 16:56:29 +08:00
Sebastiaan van Stijn
2879129b44
Merge pull request #28117 from ping035627/ping035627-patch-1107
...
Modify to improve code readability
Upstream-commit: f5283bd253868b6f27b833e7eb7b6c36d45d2096
Component: engine
2016-11-08 09:44:45 +01:00
allencloud
2b57d0c977
support show numbers of global service in service ls command
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ea03f090b8e0d5530c50857f54d8e961f9139b92
Component: engine
2016-11-08 16:17:15 +08:00
yupeng
9cafe2a9d5
context.Context should be the first parameter of a function
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 4b86bd050b6e4c944407680d99c9ce6f25b8cc53
Component: engine
2016-11-08 14:51:17 +08:00
Victor Vieux
a24a48331c
support settings in docker plugins install
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 69276fddf8269e6de7bf297d4a7127e0ed977cb7
Component: engine
2016-11-07 22:49:22 -08:00
John Howard
e349632310
Adds minimum API version to version
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d29995bb8481a18fd00b10fe49f2960ee8136619
Component: engine
2016-11-07 21:20:00 -08:00
Yong Tang
2a49113fdc
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: 599be5a551bbadf23d76677c7d54c338901781f6
Component: engine
2016-11-07 16:42:32 -08:00
WangPing
abc011e59f
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: 2bfd1495de5f0003eaa93ebbb4df376644cdd618
Component: engine
2016-11-08 08:37:44 +08:00
Misty Stanley-Jones
a152887ed4
Merge pull request #28029 from tealtail/27994-add-service-ls-truncate-opt
...
remove COMMAND column from `service ls` output. closes #27994
Upstream-commit: c16860b649ae75f86d085a17958e5397f393c2f1
Component: engine
2016-11-07 14:39:16 -08:00
Aaron Lehmann
6a317cb5f3
Merge pull request #25974 from kunalkushwaha/mount-add
...
correct handling of volumes while service update.
Upstream-commit: c1cdfe78f6eb71b33afbba4dd2a6a713a959177f
Component: engine
2016-11-07 10:34:22 -08:00
Vincent Demeester
feddd2acda
Merge pull request #25983 from jhorwit2/jah/ps-refactor
...
Add -a option to service/node ps
Upstream-commit: 89ef0f21510cf14eb78f2c0677cc936882c5a261
Component: engine
2016-11-07 17:33:10 +01:00
Alicia Lauerman
5de88667b4
remove COMMAND column from service ls output. closes #27994
...
Signed-off-by: Alicia Lauerman <alicia@eta.im >
Upstream-commit: 6ad95c4dad4aa58d4288b43b58044de0d439d3ad
Component: engine
2016-11-06 13:32:44 -05:00
Josh Horwitz
b9b5178daa
Add -a option to service/node ps
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: 139fff2bf0ebe12b61871ba8ec8be8d51c2338db
Component: engine
2016-11-06 07:40:39 -05:00
Victor Vieux
20cafdbd7e
Merge pull request #28010 from vieux/fix_experimental_client
...
always add but hide experimental cmds and flags
Upstream-commit: f6edbdf8835359a83e9d5786ffe09d176609fb07
Component: engine
2016-11-04 13:49:19 -07:00
Victor Vieux
ffbf855e39
update cobra and use Tags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: d34ca0178e42cddc760316bbcb6a3aa8bea8b3ed
Component: engine
2016-11-04 12:04:14 -07:00
Antonio Murdaca
9ce11130e0
cli/info: fix seccomp warning
...
also reword seccomp warning around default seccomp profile
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: c68e75e51d58167b5b21e77bbc7b701fe0888096
Component: engine
2016-11-04 19:25:51 +01:00
Yong Tang
133eec9cfa
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: 846baf1fd3efcbfbf9d3eb99e436ca9a59d3e185
Component: engine
2016-11-04 09:43:10 -07:00
Justin Cormack
71fb2940a4
Merge pull request #26276 from runcom/seccomp-conf
...
daemon: add a flag to override the default seccomp profile
Upstream-commit: efa5e85cf7c6d91fbc8003770fee14bd716a2fdd
Component: engine
2016-11-04 15:45:30 +00:00
Vincent Demeester
bf52c4c327
Merge pull request #27857 from vasil-yordanov/docker-service-hostname-2
...
Adding the hostname option to docker service command
Upstream-commit: b4e14c6edcd201f0b5fade154714218a41005d77
Component: engine
2016-11-04 15:22:55 +01:00
Vincent Demeester
1931090ba1
Merge pull request #28045 from vincentbernat/fix/inspect-short-description
...
cli: shorten description of "inspect" subcommand
Upstream-commit: 16bcc1afddd83de27e22ac519af62280a968534b
Component: engine
2016-11-04 08:15:49 +01:00
Kunal Kushwaha
12c98acb61
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: 630613d69ef111ce4090d35dc74669dff5966d57
Component: engine
2016-11-04 10:15:18 +09:00
Victor Vieux
9d6e24532c
always add but hide experimental cmds and flags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 3e43fa28ecc265ebbb95afd94017e7e3d5ccfdc0
Component: engine
2016-11-03 17:31:12 -07:00
Sebastiaan van Stijn
8ef82a0e0b
Merge pull request #28021 from YuPengZTE/devString
...
Add “” for String
Upstream-commit: 6b3b9d53e1cb0db90d3e25881fcf1e225179040e
Component: engine
2016-11-03 17:03:56 -07:00
Vincent Bernat
b3ef6232b4
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: 3443668e044476869227295a0aabb65c50fdd3ef
Component: engine
2016-11-03 20:46:28 +01:00
Victor Vieux
bff4ddec3e
fix double [y/N] in container prune
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eadb5b315be2ca51aa59ce55ef34478fbdceefa2
Component: engine
2016-11-03 10:33:17 -07:00
Sebastiaan van Stijn
6477b96f99
Merge pull request #27910 from dperny/node_ip_in_raft
...
Auto-detect node IP address
Upstream-commit: b2641bd9df5c2511f9af5c811590617884c24a0f
Component: engine
2016-11-03 10:30:55 -07:00
Drew Erny
e11e25579b
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: 9bcf623719104fbd196ab0ca14af48f790980499
Component: engine
2016-11-03 08:10:14 -07:00
Vincent Demeester
19febb4ca7
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: aa90a531c598af4ace14ee9e96021743fe4cff2e
Component: engine
2016-11-03 03:12:10 -07:00
yuexiao-wang
bb59ba04f3
Update for docker volume create
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cf5fadeb0c8d1c08c0f7f59e9d530776c92c728a
Component: engine
2016-11-03 22:40:04 +08:00
Nikolay Milovanov
c0f36a9c86
Adding the hostname option to docker service command
...
Signed-off-by: Nikolay Milovanov <nmil@itransformers.net >
Upstream-commit: b222aa1a582f24d0164a72883e5f6503cc6a1d64
Component: engine
2016-11-03 10:02:14 +00:00
yupeng
d70c70756d
Add for String
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 167daf5060e75a597d70fd7240d59d34b160f8ef
Component: engine
2016-11-03 16:15:26 +08:00
Akihiro Suda
2213e9bb9f
cli: add --mount to docker run
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 273eeb813c1db0f42c2ad5e053972eeb00907568
Component: engine
2016-11-03 07:08:59 +00:00
Sebastiaan van Stijn
1364d97991
Merge pull request #27979 from allencloud/more-specific-in-service-scale-description
...
add replicated in service scale command description
Upstream-commit: d83f56ee5fa6e398a4205a6d4d32feda560df120
Component: engine
2016-11-02 18:01:59 -07:00
Antonio Murdaca
250cd5b7d2
daemon: add a flag to override the default seccomp profile
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: b237189e6c8a4f97be59f08c63cdcb1f2f4680a8
Component: engine
2016-11-02 21:41:29 +01:00
allencloud
3e5ee94d25
node rm can be applied on not only active node
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 002262d6f5d9d88b690124b3743db6856fe4f599
Component: engine
2016-11-02 17:22:04 +08:00
allencloud
1195e5e7b8
add replicated in service scale command description
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b9fdbbad6139e6dac5850e82bb67781f467e77c8
Component: engine
2016-11-02 16:15:57 +08:00
Sebastiaan van Stijn
50046511ff
Merge pull request #27948 from WeiZhang555/consistent-filters
...
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: f96d45dc8ac21db1f082230e2f828a86e15cad46
Component: engine
2016-11-02 00:53:15 -07:00
Sebastiaan van Stijn
bc07595486
Merge pull request #27942 from yuexiao-wang/remove-const
...
Remove some redundant consts
Upstream-commit: 2c43762cf2a33d9782c1a87ebf2469fc138a5c6b
Component: engine
2016-11-01 20:43:50 -07:00
yuexiao-wang
457e448f9f
Remove some redundant consts
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 6b412d4fd30afe2a24f66839a6c26fbc94b01493
Component: engine
2016-11-02 16:42:42 +08:00
Sebastiaan van Stijn
ed695b371e
Merge pull request #27864 from vdemeester/add-statsformat-to-configfile
...
Add StatsFormat to the config.json file
Upstream-commit: b998088145c1e7b6a2814a3dcb0f68855ae17123
Component: engine
2016-11-01 20:32:13 -07:00
Michael Crosby
c731e1c51c
Merge pull request #27953 from thaJeztah/fix-deprecation-version
...
Update deprecation versions for "email" and colon in "security options"
Upstream-commit: 74bdacb908e0a49447bf81700162de4a29c4b2b6
Component: engine
2016-11-01 14:31:32 -07:00
Michael Crosby
9e9fd11160
Merge pull request #22641 from cpuguy83/build_finalization
...
Adds ability to flatten image after build
Upstream-commit: 22f3e43e9a35711bb63108f1714840a92a4b138e
Component: engine
2016-11-01 14:30:18 -07:00
Brian Goff
c7c95dc226
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: 362369b4bbea38881402d281ee2015d16e8b10ce
Component: engine
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