Commit Graph

1882 Commits

Author SHA1 Message Date
add78ffc8a Fix zsh completion for 'docker exec --env'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:28 +00:00
a91e31b2df update docs/reference/commandline/network_inspect.md
The following sentences (introduced in v1.11 via #21160) were misleading for Swarm mode services (>= v1.12)

  For networks backed by multi-host network driver, such as Overlay,
  this command also shows the container endpoints in other hosts in the
  cluster. These endpoints are represented as "ep-{endpoint-id}" in the output.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-06-02 00:10:28 +00:00
7765e48aaa Remove duplicate keys in labels of docker info
This fix tries to address the issue raised in 24392 where
labels with duplicate keys exist in `docker info`, which
contradicts with the specifications in the docs.

The reason for duplicate keys is that labels are stored as
slice of strings in the format of `A=B` (and the input/output).

This fix tries to address this issue by checking conflict
labels when daemon started, and remove duplicate labels (K-V).

The existing `/info` API has not been changed.

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

This fix fixes 24392.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-06-02 00:10:28 +00:00
47b507e48a Make experimental a runtime flag
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-06-02 00:10:28 +00:00
4df7e0a9fa Fix the incorrect links in the document about network and service
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-06-02 00:10:28 +00:00
78b56b5529 Update the subtitle for stack ps
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-06-02 00:10:28 +00:00
04b0779de4 Fix bash completion for docker exec --env
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:28 +00:00
78c0d50c9f Add force option to service update
Currently, there's no way to restart the tasks of a service without
making an actual change to the service. This leads to us giving awkward
workarounds as in
https://github.com/docker/docker.github.io/pull/178/files, where we tell
people to scale a service up and down to restore balance, or make
unnecessary changes to trigger a restart.

This change adds a --force option to "docker service update", which
forces the service to be updated even if no changes require that.

Since rolling update parameters are respected, the user can use
"docker service --force" to do a rolling restart. For example, the
following is supported:

   docker service update --force --update-parallelism 2 \
   --update-delay 5s myservice

Since the default value of --update-parallelism is 1, the default
behavior is to restart the service one task at a time.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-02 00:10:27 +00:00
f18c41ee83 Modify the links for docker container commands
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-06-02 00:10:27 +00:00
4f4c129973 Move bash completion logic to new subcommand: wait
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
d2ef5775b8 Move bash completion logic to new subcommand: update
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
b8d3d1e6ec Move bash completion logic to new subcommand: unpause
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
28cf2654e7 Move bash completion logic to new subcommand: top
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
620d0051c8 Move bash completion logic to new subcommand: stop
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
04886bca2f Move bash completion logic to new subcommand: stats
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
f58b6746d7 Move bash completion logic to new subcommand: start
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
05656756e6 Move bash completion logic to new subcommand: run
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
39880d7731 Move bash completion logic to new subcommand: rm
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
2a9e70cf34 Move bash completion logic to new subcommand: restart
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
f533df0821 Move bash completion logic to new subcommand: port
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
120b57a61c Move bash completion logic to new subcommand: port
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
b659865f57 Move bash completion logic to new subcommand: pause
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
adaa718195 Move bash completion logic to new subcommand: ps
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
bd996a11a1 Move bash completion logic to new subcommand: logs
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:27 +00:00
13fde2b8c5 Move bash completion logic to new subcommand: kill
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
c2c341f42b Move bash completion logic to new subcommand: inspect
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
4db49a11a5 Move bash completion logic to new subcommand: diff
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
f560199333 Move bash completion logic to new subcommand: exec
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
eac71844f4 Move bash completion logic to new subcommand: diff
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
7db1e8272b Move bash completion logic to new subcommand: create
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
0ef51632ec Move bash completion logic to new subcommand: cp
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
e2678f21d9 Move bash completion logic to new subcommand: commit
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
d5cdbdc734 Move bash completion logic to new subcommand: attach
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
f857f420aa Add bash completion for docker container
At this point, we just delegate to the existing completions.

Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:26 +00:00
4865a342fb fix wrong location for network related doc files
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-06-02 00:10:26 +00:00
a7124389ed Add Networks placeholder to ps --format
Passing {{.Networks}} to the format parameter will prompt ps to
display all the networks the container is connected to.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-06-02 00:10:26 +00:00
7ec82562ce Rewrites to Developing Plugins topic
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-06-02 00:10:26 +00:00
7f36c3a1a0 Sync docker/docker refs with files mistakenly edited in docker.github.io repo
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-06-02 00:10:26 +00:00
9012efce15 support insecure registry in configuration reload
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-06-02 00:10:26 +00:00
c8da630897 Fix the typo of URLs
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2017-06-02 00:10:25 +00:00
73dd34b2b3 Exec: Add ability to set environment variables
Keeping the current behavior for exec, i.e., inheriting
variables from main process. New variables will be added
to current ones. If there's already a variable with that
name it will be overwritten.

Example of usage: docker exec -it -e TERM=vt100 <container> top

Closes #24355.

Signed-off-by: Jonh Wendell <jonh.wendell@redhat.com>
2017-06-02 00:10:25 +00:00
38d93769fe zsh: fix completion when docker output only has the header line
Unfortunately, `(f)` aka `(ps:\n:)` flag will not create an array when
there is only one line. The subsequent use of indexes will then affect
the string. This leads to `docker rmi <tab>` to complete on the header
line instead of nothing.

Therefore, for each use of `(f)`, we ensure that we have an extra new
line to be sure we get an array.

Credit to @povesteam for the original report and fix in #27373.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
2017-06-02 00:10:25 +00:00
77bcb1c514 Update the link for sharing images via repositories
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-06-02 00:10:25 +00:00
ba501cf4fd Improve comments in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:25 +00:00
a511da3c57 Add bash completion for dockerd --shutdown-timeout
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:25 +00:00
62fb2cfa94 Update the link for understand data volumes
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2017-06-02 00:10:25 +00:00
ef158e3e0a Add config parameter to change stop timeout during daemon shutdown
This fix tries to add a daemon config parameter `--shutdown-timeout`
that specifies the timeout value to stop containers gracefully
(before SIGKILL). The default value is 15s.

The `--shutdown-timeout` parameter is added to daemon options and
config file. It will also be updated during daemon reload.

Additional test cases have been added to cover the change.

This fix fixes #22471.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-06-02 00:10:25 +00:00
fb789bd06d add creation timestamp to docker network inspect
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-06-02 00:10:25 +00:00
34630120b3 Align bash completion of plugins to completion of nodes and services
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:25 +00:00
2160c366b8 Remove invalid installtion content because there is no corresponding files
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2017-06-02 00:10:25 +00:00