From f1310bd820a128a7167466eaeefa6438cb324580 Mon Sep 17 00:00:00 2001 From: ktrysmt Date: Wed, 13 Dec 2017 17:35:12 +0900 Subject: [PATCH 1/4] Fixed #750 Signed-off-by: Kotaro Yoshimatsu Upstream-commit: db05d8ad79e34e8096f31585fe9ffe0ce18f98d8 Component: cli --- components/cli/contrib/completion/zsh/_docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cli/contrib/completion/zsh/_docker b/components/cli/contrib/completion/zsh/_docker index d52aa913e4..e027877143 100644 --- a/components/cli/contrib/completion/zsh/_docker +++ b/components/cli/contrib/completion/zsh/_docker @@ -745,7 +745,7 @@ __docker_container_subcommand() { "($help)--privileged[Give extended Linux capabilities to the command]" \ "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \ "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \ - "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" + "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" \ "($help -):containers:__docker_complete_running_containers" \ "($help -)*::command:->anycommand" && ret=0 case $state in From 3ac0d82798836c6b1f6f58be7b548b54a73c75f4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 14 Dec 2017 13:50:56 -0800 Subject: [PATCH 2/4] Fix "on-failure" restart policy being documented as "failure" Commit ddadd3db494ce568a6b847932677f837802ea6b5 refactored the markdown documentation, but accidentally changed `on-failure` to `failure`. This patch corrects this change. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 43217d733205b0694f791e7326bfed6d13b645f0 Component: cli --- components/cli/docs/reference/commandline/run.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/cli/docs/reference/commandline/run.md b/components/cli/docs/reference/commandline/run.md index b6f278c146..3188e7ab6f 100644 --- a/components/cli/docs/reference/commandline/run.md +++ b/components/cli/docs/reference/commandline/run.md @@ -588,11 +588,11 @@ Use Docker's `--restart` to specify a container's *restart policy*. A restart policy controls whether the Docker daemon restarts a container after exit. Docker supports the following restart policies: -| Policy | Result | -|:----------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| `no` | Do not automatically restart the container when it exits. This is the default. | -| `failure` | Restart only if the container exits with a non-zero exit status. Optionally, limit the number of restart retries the Docker daemon attempts. | -| `always` | Always restart the container regardless of the exit status. When you specify always, the Docker daemon will try to restart the container indefinitely. The container will also always start on daemon startup, regardless of the current state of the container. | +| Policy | Result | +|:---------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| `no` | Do not automatically restart the container when it exits. This is the default. | +| `on-failure[:max-retries]` | Restart only if the container exits with a non-zero exit status. Optionally, limit the number of restart retries the Docker daemon attempts. | +| `always` | Always restart the container regardless of the exit status. When you specify always, the Docker daemon will try to restart the container indefinitely. The container will also always start on daemon startup, regardless of the current state of the container. | ```bash $ docker run --restart=always redis From 14b537bf913cc3b690f0c2dbc5224ffcb2527ba4 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 13 Dec 2017 14:16:46 -0800 Subject: [PATCH 3/4] Updated deprecation status for "repository:shortid" The `repository:shortid` syntax for referencing images is very little used, collides with with tag references can be confused with digest references. The `repository:shortid` notation was deprecated in Docker 1.13, and scheduled for removal in Docker 17.12. This patch updates the deprecation status for this feature. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 1a21ca12a62ec78af55b71a04b1ca606ef6771fe Component: cli --- components/cli/docs/deprecated.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/components/cli/docs/deprecated.md b/components/cli/docs/deprecated.md index 78df5347d0..9ac2f08c16 100644 --- a/components/cli/docs/deprecated.md +++ b/components/cli/docs/deprecated.md @@ -74,9 +74,13 @@ The `filter` param to filter the list of image by reference (name or name:tag) i ### `repository:shortid` image references **Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)** -**Target For Removal In Release: v17.12** +**Removed In Release: v17.12** -`repository:shortid` syntax for referencing images is very little used, collides with tag references can be confused with digest references. +The `repository:shortid` syntax for referencing images is very little used, +collides with tag references, and can be confused with digest references. + +Support for the `repository:shortid` notation to reference images was removed +in Docker 17.12. ### `docker daemon` subcommand **Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)** From edf70bdb82ec738ddd46abc5ab50571e5a820638 Mon Sep 17 00:00:00 2001 From: Harald Albers Date: Wed, 13 Dec 2017 08:40:05 +0100 Subject: [PATCH 4/4] Add support for generic resources to bash completion Adds bash completion for - `service create --generic-resource` - `service update --generic-resource-(add|rm)` - `dockerd --node-generic-resource` Signed-off-by: Harald Albers Upstream-commit: 8ec80eec672b93be03843412f195fae477e81c4a Component: cli --- components/cli/contrib/completion/bash/docker | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/cli/contrib/completion/bash/docker b/components/cli/contrib/completion/bash/docker index b206af725d..9e7298664e 100644 --- a/components/cli/contrib/completion/bash/docker +++ b/components/cli/contrib/completion/bash/docker @@ -2221,6 +2221,7 @@ _docker_daemon() { --metrics-addr --mtu --network-control-plane-mtu + --node-generic-resource --oom-score-adjust --pidfile -p --registry-mirror @@ -3396,6 +3397,7 @@ _docker_service_update_and_create() { --dns-option --dns-search --env-file + --generic-resource --group --host --mode @@ -3457,6 +3459,8 @@ _docker_service_update_and_create() { --dns-rm --dns-search-add --dns-search-rm + --generic-resource-add + --generic-resource-rm --group-add --group-rm --host-add