Sebastiaan van Stijn
4118e0c9ee
Improve flag help consistency, and update docs
...
This adds the `--live-restore` option to the documentation.
Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 64a8317a5a
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:24 -07:00
Vincent Demeester
285bfa04ac
Small zsh completion fix on --pretty & --no-resolve
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 698bd5ab65
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:13 -07:00
Steve Durrheimer
e4d263c99b
Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 2e6922a6d3
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:12 -07:00
Steve Durrheimer
f6dfc0394f
Add zsh completion for 'dockerd --oom-score-adjust'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 5d29732bdf
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:12 -07:00
Steve Durrheimer
5f8d7aa0f4
Add zsh completion for 'docker service {create,update} --registry-auth'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 64f08906a2
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:11 -07:00
Steve Durrheimer
e204600ee1
Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit ba5d9f63a3
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:11 -07:00
Paul Furtado
25caee39a7
Change $prog back to docker in sysvinit-redhat
...
(and set $exec to dockerd instead)
This ensures end users do not need to make any configuration changes
due to the rename from docker to dockerd in version 1.12.
Signed-off-by: Paul Furtado <pfurtado@hubspot.com>
(cherry picked from commit acb41ddc9d
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:15:11 -07:00
Harald Albers
3bd6c0b8dd
bash completion for docker daemon --oom-score-adjust
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e1e310ea1f
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:58 -07:00
Sebastiaan van Stijn
7491ebe00a
Remove shorthand flags for "mount", "pretty", and "no-resolve"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7bf0faf423
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:58 -07:00
Vincent Demeester
cda05164ba
Remove --command flag for service update
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit e4a024d590
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:14:57 -07:00
Harald Albers
8a810acb1e
Change bash completion for docker run --net*
to --network*
...
Ref: https://github.com/docker/docker/pull/23324
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit c4846f6972
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:49 -07:00
Lei Jitang
96247f4277
Add IPVLAN and DUMMY to check-config.sh
...
This commit add DUMMY and IPVLAN to check-config.sh
because they are need for ipvlan and macvlan network
driver.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit f5940ef725
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:48 -07:00
Harald Albers
9b0ebd26e8
Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit a394490d38
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:48 -07:00
Harald Albers
fc4c8d927a
bash completion for docker service {create,update} --registry-auth
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit a44e71c427
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-25 23:13:48 -07:00
Harald Albers
d8d1573b0d
bash completion for default port on docker swarm {init,join}
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 009d50e2d8
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:33:30 -07:00
Harald Albers
00a988c2ad
bash completion can be configured to show node and service IDs
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 715754ee61
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:33:30 -07:00
Harald Albers
89bb424ce2
bash completion for docker {service,node}
filters
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 2b34fa0511
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:33:30 -07:00
Vincent Demeester
23be238414
Use "on-failure" for both containers and services
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit a859a33647
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:33:21 -07:00
Jonathan Lomas
6b30370210
Remove unmatched bracket from _docker for zsh
...
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
(cherry picked from commit 7631dc80a6
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:32:22 -07:00
Aleksa Sarai
65c03f1013
contrib: systemd: set Limit* to infinity
...
There is a not-insignificant performance overhead for all containers (if
containerd is a child of Docker, which is the current setup) if systemd
sets rlimits on the main Docker daemon process (because the limits
propogate to all children).
Signed-off-by: Aleksa Sarai <asarai@suse.de>
(cherry picked from commit 8db61095a3
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:32:15 -07:00
Steve Durrheimer
4cedd8fc23
Add zsh completion for 'docker service' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit f5d768e2c5
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:32:09 -07:00
Steve Durrheimer
65e339bed1
Add zsh completion for 'docker daemon --runtimes' and 'docker run --runtime'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit a5c7eb607e
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:45 -07:00
Steve Durrheimer
dbdd38e421
Add zsh completion for 'docker swarm' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 2086663abd
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:44 -07:00
Steve Durrheimer
46a866ece9
Add zsh completion for 'docker node' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 024698718f
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:44 -07:00
allencloud
49981f8327
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 184afb92bf
)
2016-06-30 17:11:29 -07:00
Brian Goff
0f1439a065
Add ip_vs to check-config script
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 9e14002ced
)
2016-06-30 16:47:52 -07:00
Harald Albers
795560dba2
bash completion enhancements for docker {swarm,node,service}
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e3339a75d3
)
2016-06-30 16:47:51 -07:00
Alessandro Boch
f312883f39
Add modules for secure overlay network to check-config.sh
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit c355e059cc
)
2016-06-30 16:47:45 -07:00
Antonio Murdaca
ae0648fca8
contrib: builder: rpm: add Fedora 24
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 0b83f27328
)
2016-06-30 16:47:45 -07:00
Steve Durrheimer
790501e51f
Add zsh completion for 'load' and 'save' image events
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit e2f1f699b3
)
2016-06-30 16:47:45 -07:00
Steve Durrheimer
7b643a09d5
Add zsh completion for 'docker {create,run,network connect} --link-local-ip'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 704d9b6864
)
2016-06-30 16:47:44 -07:00
Steve Durrheimer
c6721ada67
Add zsh completion for 'docker run --storage-opt size='
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 857e7d6ae4
)
2016-06-30 16:47:44 -07:00
Steve Durrheimer
3714e9b393
Re-Add zsh completion for '-c' alias to '--cpu-shares'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 4c23ac0ae5
)
2016-06-30 16:47:44 -07:00
Steve Durrheimer
27d64ec8ad
Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 8e582a2573
)
2016-06-30 16:47:44 -07:00
Harald Albers
5604fb2362
bash completion for -c
alias to --cpu-shares
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 79296b2770
)
2016-06-30 16:47:42 -07:00
Harald Albers
b23562ea20
bash completion for docker daemon --storage-opt btrfs.min_space
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit f693b99870
)
2016-06-30 16:47:42 -07:00
Harald Albers
0afeae16de
bash completion for docker {run,create} --storage-opt
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 7d2ffa00c0
)
2016-06-30 16:47:42 -07:00
Harald Albers
749f94e885
bash completion for load
and save
image events
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 5334520bf0
)
2016-06-30 16:47:41 -07:00
Harald Albers
5188629256
bash completion for docker daemon --storage-driver olverlay2
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit d96eeff194
)
2016-06-30 16:47:41 -07:00
Harald Albers
9117c0dd41
bash completion for docker {run,create,network connect} --link-local-ip
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 98483f57ed
)
2016-06-30 16:47:41 -07:00
Steve Durrheimer
7d72ca329c
Add zsh completion for 'docker daemon --live-restore'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
(cherry picked from commit 8036fc794a
)
2016-06-30 16:47:41 -07:00
Harald Albers
75193e58ce
fix bash completion for docker {swarm,node}
subcommands
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e65f036e13
)
2016-06-30 16:47:38 -07:00
Harald Albers
a4e3415235
correct sort order in new bash completions
...
The completion for the new `docker service`, `docker swarm` and
`docker node` command families were partly added in non-alphabetical
order.
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 19753ec84d
)
2016-06-30 16:47:38 -07:00
Mike Goelzer
b8b938c61c
Add bash completion for docker service scale
...
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>
Conflicts:
contrib/completion/bash/docker
(cherry picked from commit 5cf73a47f5
)
2016-06-30 16:47:38 -07:00
Harald Albers
ffb4daf0fb
fix bash completion for docker service
subcommands
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 42f3b1f4ad
)
2016-06-18 20:58:23 -07:00
Ke Xu
05c32e7f08
fix #23017 , add zsh completion for dockerd
...
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
(cherry picked from commit bd1fc1e5c2
)
2016-06-17 13:09:11 -07:00
Harald Albers
fcdd4d4a52
bash completion for docker swarm update --cert-expiry
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit dc2fc75d42
)
2016-06-17 13:09:11 -07:00
Michael Crosby
e491dbb38a
Set systemd KillMode
...
Change the kill mode to process so that systemd does not kill container
processes when the daemon is shutdown but only the docker daemon
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit db435f526a
)
2016-06-16 23:36:54 -07:00
Arnaud Porterie (icecrime)
e6e1fd5d06
Make --dispatcher-heartbeat-period
a duration
...
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-06-14 18:10:49 -07:00
Mike Goelzer
35e2970b98
Update bash completion for Docker 1.12 CLI commands
...
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>
2016-06-14 12:57:40 -07:00