From 254566169d55105be374b63a59e00a2ded01fc06 Mon Sep 17 00:00:00 2001 From: Vimal Raghubir Date: Mon, 25 Jun 2018 14:54:33 -0400 Subject: [PATCH 1/3] Add: Add missing option Signed-off-by: Vimal-Raghubir (cherry picked from commit a205aecb807ab9c0edc859a2371e2887dfdba67c) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/dockerd.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index 3dc4fd5aed..1afc27e8b1 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -1432,11 +1432,12 @@ The list of currently supported options that can be reconfigured is this: specified at container creation. It defaults to "default" which is the runtime shipped with the official docker packages. - `runtimes`: it updates the list of available OCI runtimes that can - be used to run containers + be used to run containers. - `authorization-plugin`: specifies the authorization plugins to use. - `allow-nondistributable-artifacts`: Replaces the set of registries to which the daemon will push nondistributable artifacts with a new set of registries. - `insecure-registries`: it replaces the daemon insecure registries with a new set of insecure registries. If some existing insecure registries in daemon's configuration are not in newly reloaded insecure resgitries, these existing ones will be removed from daemon's config. - `registry-mirrors`: it replaces the daemon registry mirrors with a new set of registry mirrors. If some existing registry mirrors in daemon's configuration are not in newly reloaded registry mirrors, these existing ones will be removed from daemon's config. +- `shutdown-timeout`: it replaces the daemon's existing configuration timeout with a new timeout for shutting down all containers. Updating and reloading the cluster configurations such as `--cluster-store`, `--cluster-advertise` and `--cluster-store-opts` will take effect only if From e1ee48ab0451af193c81bde072b3c59c5ba36019 Mon Sep 17 00:00:00 2001 From: Silvin Lubecki Date: Mon, 2 Jul 2018 14:21:10 +0200 Subject: [PATCH 2/3] Fixing issue #1167 "Format example typo" Signed-off-by: Silvin Lubecki (cherry picked from commit d0ddf91539c4d9b0618e15087c395452dd97a58a) Signed-off-by: Sebastiaan van Stijn --- man/src/image/history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/src/image/history.md b/man/src/image/history.md index cef058e50e..8c10e997c2 100644 --- a/man/src/image/history.md +++ b/man/src/image/history.md @@ -41,7 +41,7 @@ The following example uses a template without headers and outputs the `ID` and `CreatedSince` entries separated by a colon for all images: ```bash -$ docker images --format "{{.ID}}: {{.Created}} ago" +$ docker images --format "{{.ID}}: {{.CreatedSince}} ago" cc1b61406712: 2 weeks ago : 2 weeks ago From deacc39445ccc08c99a52468d2cc497b27ca60a0 Mon Sep 17 00:00:00 2001 From: Peter Kehl Date: Wed, 4 Jul 2018 14:00:21 -0700 Subject: [PATCH 3/3] For docker/docker.github.io/issues/6987 Signed-off-by: Peter Kehl (cherry picked from commit 249c8652a272d2031651f026e8c698094de5ecc9) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/history.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/commandline/history.md b/docs/reference/commandline/history.md index 6814501287..20cf8f5e7e 100644 --- a/docs/reference/commandline/history.md +++ b/docs/reference/commandline/history.md @@ -80,7 +80,7 @@ The following example uses a template without headers and outputs the `ID` and `CreatedSince` entries separated by a colon for the `busybox` image: ```bash -$ docker history --format "{{.ID}}: {{.CreatedAt}}" busybox +$ docker history --format "{{.ID}}: {{.CreatedSince}}" busybox f6e427c148a7: 4 weeks ago : 4 weeks ago