Steve Durrheimer
5a143d3097
Move zsh completion logic to new subcommand: restart
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 64b546e7b8e6248eadd4e452d4e91d74f88563f5
Component: engine
2016-11-04 08:55:01 +01:00
Steve Durrheimer
a591b6cdc1
Move zsh completion logic to new subcommand: rename
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: fc6bd2272525772ab5c05cad2679a06afdfabb51
Component: engine
2016-11-04 08:54:59 +01:00
Steve Durrheimer
68f554a891
Move zsh completion logic to new subcommand: port
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 4ffc37224dbf9bcfe11a3e81c42d090bbe5761e1
Component: engine
2016-11-04 08:54:58 +01:00
Steve Durrheimer
5fd4d1e40f
Move zsh completion logic to new subcommand: pause, unpause
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: e602bfbc34bb69bb2c9f0e08b4bfe31362dd36fc
Component: engine
2016-11-04 08:54:56 +01:00
Steve Durrheimer
f023ac8daf
Move zsh completion logic to new subcommand: ps
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 44bb318161a0406e121c231b735395536fab27c7
Component: engine
2016-11-04 08:54:55 +01:00
Steve Durrheimer
c4f4b9e65d
Move zsh completion logic to new subcommand: logs
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 28bd6162126c0d494b2d8379e2608a1fc7017aa7
Component: engine
2016-11-04 08:54:53 +01:00
Steve Durrheimer
03b262c50c
Move zsh completion logic to new subcommand: kill
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 45fdea257c7ee8c96249a8772809d23768ed7612
Component: engine
2016-11-04 08:54:51 +01:00
Steve Durrheimer
bd9b143f60
Add zsh completion logic to new subcommand: inspect
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: e5424b656b0eeb7006384d8846c8e05e02a9e35f
Component: engine
2016-11-04 08:54:50 +01:00
Steve Durrheimer
4553330ab9
Move zsh completion logic to new subcommand: export
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 911ef73ee1777eaa7cac08dadaf77bdd9cc9a2e5
Component: engine
2016-11-04 08:54:48 +01:00
Steve Durrheimer
509642ffb2
Move zsh completion logic to new subcommand: exec
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ee27e97218e2c37bfb3adbef643d671ca75cc18d
Component: engine
2016-11-04 08:54:47 +01:00
Steve Durrheimer
3848320570
Move zsh completion logic to new subcommand: diff
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 0632c344398ce0b36f14e6c100153892c0933145
Component: engine
2016-11-04 08:54:45 +01:00
Steve Durrheimer
bbacc2e9b9
Move zsh completion logic to new subcommand: create
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: abf2f0087d46a2568b1830a819c99b1fb90de445
Component: engine
2016-11-04 08:54:44 +01:00
Steve Durrheimer
fdac29909c
Move zsh completion logic to new subcommand: cp
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b067a59bfd8dc8a5758eaa4d03c948b100a4af7b
Component: engine
2016-11-04 08:54:42 +01:00
Steve Durrheimer
15956ca1d6
Move zsh completion logic to new subcommand: commit
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 89737ea253bad50da4674b708c6e3378d0ebfe42
Component: engine
2016-11-04 08:54:40 +01:00
Steve Durrheimer
ed305ee046
Move zsh completion logic to new subcommand: attach
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: d5ca5c1e084845c8558a598ea7dfde9bfe6cd24d
Component: engine
2016-11-04 08:54:39 +01:00
Steve Durrheimer
2301f39de7
Add zsh completion for 'docker container' subcommands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: a9443b738856f9562c8e50a8838a79e1378857b0
Component: engine
2016-11-04 08:54:37 +01:00
Steve Durrheimer
1d0f8b0e25
Rename containers complete function in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 431e9cb27c26be44ea116517635a31745c3f19bc
Component: engine
2016-11-04 08:54:27 +01:00
Brian Goff
ba87ff5ff2
Merge pull request #28046 from tophj-ibm/make-debs-1610
...
[ppc64le] add yakkety yak to 'make deb'
Upstream-commit: d5c3eb0afb9ccbdb671c4841727bab87a4bb2145
Component: engine
2016-11-03 20:17:36 -04: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
Christopher Jones
45efa44b4f
[ppc64le] add yakkety yak to 'make deb'
...
This adds 'make deb' support for yakkety yak on ppc64le
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: da382044d3630bcdeb1eac64f2f7ad476e0cf007
Component: engine
2016-11-03 15:59:59 -04:00
Christopher Jones
dc399e49f2
[ppc64le] update make deb go download link
...
Updates the ppc64le `make deb` trusty download link to be
consistent with the other Dockerfiles. Also minor clarification
to how we install go.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 629e85ad8975046eba3a88fdc8448759525e27bd
Component: engine
2016-11-03 15:26:28 -04: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
de4a768f1f
Merge pull request #27746 from Microsoft/jjh/pscompletion
...
Redirect powershell completion
Upstream-commit: 11605903d0a0126c8b712a9d4cda2614622e0f48
Component: engine
2016-11-02 19:08:38 -07:00
Sebastiaan van Stijn
5fae8682b8
Merge pull request #28007 from justincormack/check-config-error
...
Make the check-config script return success or failure
Upstream-commit: a1a93f631f06a495674f93e2572098a900aa093b
Component: engine
2016-11-02 18:23:59 -07: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
Justin Cormack
74c006a5ce
Make the check-config script return success or failure
...
Although primarily a human readable script, it is quite useful
to return success or failure from this script so it can be used
as a basic test.
Fail if any check fails, including some that are optional,
other than the storage driver tests, where only one needs to
succeed, so the system has at least one workable storage driver.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 6d116ffbbbc597994855f1b6fe86af324ac649de
Component: engine
2016-11-02 23:23:52 +00: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
2fdd11175c
Merge pull request #27869 from bltavares/nuke-when-graphdir-is-a-mount
...
Nuke when graphdir is a mount
Upstream-commit: d1fe79ca84487b679d8e860e971ab82a3cc2dacf
Component: engine
2016-11-01 23:21:49 -07:00
Sebastiaan van Stijn
c22d6298d7
Merge pull request #27855 from justincormack/check-ext3
...
Do not warn in check-config script about ext3 if provided by ext4
Upstream-commit: b5589fba89bdea5424b3555a892c43921a681974
Component: engine
2016-11-01 20:21:48 -07:00
Bruno Tavares
cbd967cd2a
Nuke when graphdir is a mount
...
Previously, when the graphdir was a root of a mountpoint, we would not
be able to cleanup the graphdir, as the script would umount in case
target dir is a mount itself
```/etc/mtab
/dev/xvdc1 /var/lib/docker btrfs
```
When running the script, the graphdir would be unmounted and it would
remove a (possibly) empty folder.
```
Nuking /var/lib/docker ...
(if this is wrong, press Ctrl+C NOW!)
+ sleep 10
+ umount -f /var/lib/docker
+ rm -rf /var/lib/docker
```
This PR includes the necessary changes to nuke the folder on this
scenario, including when the graphdir is a btrfs mount iself.
Signed-off-by: Bruno Tavares <btavare@thoughtworks.com >
Upstream-commit: 5f98b977496b5c8430162b129cb94c88efb0f3b6
Component: engine
2016-11-01 22:22:25 -02:00
Vincent Demeester
d375460d63
Merge pull request #27879 from sdurrheimer/zsh-completion-ps-health-filter
...
Add zsh completion for 'docker ps --filter health='
Upstream-commit: 17aaa0890a7f53cbd9c8806a93de73898ea92813
Component: engine
2016-10-29 19:23:55 +02:00
Sebastiaan van Stijn
596b96c39e
Merge pull request #27881 from albers/completion-ps--filter-health
...
Add bash completion for `docker ps --filter health`
Upstream-commit: e1369f2f394bde84f9d0a3b262a9ce94971e039b
Component: engine
2016-10-29 10:05:24 -07:00
Harald Albers
4011d7083d
Add bash completion for docker ps --filter health
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5e6a59b59f567d5e69d9ae9df98a89a69b2664bd
Component: engine
2016-10-29 04:26:08 -07:00
Steve Durrheimer
1fda59702c
Add zsh completion for 'docker ps --filter health='
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 8df3d6a2a7e02ff1c7baf0a273d20b2422e38f39
Component: engine
2016-10-29 12:13:29 +02:00
Qiang Huang
34bac6f06e
Fix bunch of typos
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: e6866492c4492db3bb9546afa2fbaed20f4c1883
Component: engine
2016-10-29 15:03:26 +08:00
Lily Guo
ed2e1f6e2b
Service create --group param
...
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646
Signed-off-by: Lily Guo <lily.guo@docker.com >
Update flag documentation
Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups
Signed-off-by: Lily Guo <lily.guo@docker.com >
Fix docs for groups and update completion scripts
Signed-off-by: Lily Guo <lily.guo@docker.com >
Upstream-commit: 2f58494ae6e796325329f849cf547bcf94bb68e3
Component: engine
2016-10-28 13:26:31 -07:00
Vincent Demeester
86df94b9ba
Merge pull request #27369 from cezarsa/hc
...
Add --health-* flags to service create and update
Upstream-commit: f860289131e36ad2dde5ebe60d15a86fd97934b5
Component: engine
2016-10-28 21:59:52 +02:00
Michael Crosby
62e380aa24
Merge pull request #27731 from albers/completion-export--output
...
Add bash completion for `docker export --output`
Upstream-commit: 9842f019ec458ee4a5f892a08e76c319bd2c6a24
Component: engine
2016-10-28 10:59:05 -07:00
Michael Crosby
a4d5c582a1
Merge pull request #27732 from albers/completion-pause-multiple-containers
...
Add support for multiple containers to bash completion for `docker pause`
Upstream-commit: a52b9b4591b6146436d55d6579790fe6e842a714
Component: engine
2016-10-28 10:58:34 -07:00
Cezar Sa Espinola
c05d99582c
Add --health-* commands to service create and update
...
A HealthConfig entry was added to the ContainerSpec associated with the
service being created or updated.
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com >
Upstream-commit: 7bd2611789e6898576f7229255c238f7c1129293
Component: engine
2016-10-28 15:19:08 -02:00
Vincent Demeester
98f1727b06
Merge pull request #27856 from albers/completion-service-create--env-file
...
Add bash completion for `docker service create --env-file`
Upstream-commit: 1462ea37d0014ef5f7f3e4bd9d174bcd0185e71d
Component: engine
2016-10-28 19:00:06 +02:00
Justin Cormack
26bb847ac1
Do not warn in check-config script about ext3 if provided by ext4
...
Many distributions now use ext4 to provide ext2 and ext3 support,
so do not warn about possibly missing ext3 support if the config
option is used.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: b28619046a92977f33be6b3ddba5e60c589b3c0f
Component: engine
2016-10-28 12:51:09 +01:00
Harald Albers
b1f2523820
Add bash completion for docker service create --env-file
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b2db0cdae7b353c7bd4608579758f6c4a272f9fe
Component: engine
2016-10-28 12:53:32 +02:00
Steve Durrheimer
c162aa9149
Add zsh completion for 'docker service create --env-file'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 60813045c128b43cdd31f938a452abab9e9ebbc1
Component: engine
2016-10-28 08:10:42 +02:00
Vincent Demeester
ef5cf518c7
Merge pull request #27654 from gaocegege/add-quiet-mode-to-service-ps
...
Add -q option to `docker service ps`
Upstream-commit: 89011970e04614dd285ea4c3423ec7a86602488b
Component: engine
2016-10-28 05:21:03 +02:00
Ce Gao
0df16199a0
fixes #27643
...
Signed-off-by: Ce Gao <ce.gao@outlook.com >
Upstream-commit: 9efa472bd1cfe1274248612c952937334ea3e252
Component: engine
2016-10-28 08:02:57 +08:00
Sebastiaan van Stijn
c04a526463
Merge pull request #26988 from thaJeztah/remove-service-update-name-flag
...
Remove service update name flag
Upstream-commit: 3a3a87bff8dcc2f880e849e186bda02a8cee8d90
Component: engine
2016-10-27 16:55:47 -07:00
Sebastiaan van Stijn
4cadaabc3f
Remove --name flag from service update
...
The --name flag was inadvertently added to
docker service update, but is not supported,
as it has various side-effects (e.g., existing
tasks are not renamed).
This removes the flag from the service update
command.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 047e44eeb186a8bde41765a44c5966a150fa84f3
Component: engine
2016-10-27 09:16:29 -07:00