From 15ef97001872d91c2a71bff83de00a3232824083 Mon Sep 17 00:00:00 2001 From: Joao Fernandes Date: Mon, 2 Apr 2018 15:15:19 -0700 Subject: [PATCH 1/2] Use printf, not echo when creating secrets Update the docs so that users don't use `echo` when creating secrets from STDIN. `echo` adds a trailing new line, so users will probably be confused when their passwords don't work. Signed-off-by: Joao Fernandes Upstream-commit: 5238f3e93e6141b3615e7c8b38adae5ea2175385 Component: cli --- components/cli/docs/reference/commandline/secret_create.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/cli/docs/reference/commandline/secret_create.md b/components/cli/docs/reference/commandline/secret_create.md index a1164a9809..66fc78f9f8 100644 --- a/components/cli/docs/reference/commandline/secret_create.md +++ b/components/cli/docs/reference/commandline/secret_create.md @@ -27,7 +27,7 @@ Options: ## Description -Creates a secret using standard input or from a file for the secret content. You must run this command on a manager node. +Creates a secret using standard input or from a file for the secret content. You must run this command on a manager node. For detailed information about using secrets, refer to [manage sensitive data with Docker secrets](https://docs.docker.com/engine/swarm/secrets/). @@ -36,7 +36,7 @@ For detailed information about using secrets, refer to [manage sensitive data wi ### Create a secret ```bash -$ echo | docker secret create my_secret - +$ printf | docker secret create my_secret - onakdyv307se2tl7nl20anokv From 74a9225ea5969803e34afe79370e51b3eb3a6606 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 2 Apr 2018 16:07:40 -0700 Subject: [PATCH 2/2] Fix --format example for docker history Signed-off-by: Sebastiaan van Stijn Upstream-commit: 2f7bf40e733e337dadc998ae99d93fe5da5e4a16 Component: cli --- .../cli/docs/reference/commandline/history.md | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/components/cli/docs/reference/commandline/history.md b/components/cli/docs/reference/commandline/history.md index c05bbca8d1..6814501287 100644 --- a/components/cli/docs/reference/commandline/history.md +++ b/components/cli/docs/reference/commandline/history.md @@ -77,17 +77,11 @@ output the data exactly as the template declares or, when using the `table` directive, will include column headers as well. The following example uses a template without headers and outputs the -`ID` and `CreatedSince` entries separated by a colon for all images: +`ID` and `CreatedSince` entries separated by a colon for the `busybox` image: ```bash -$ docker images --format "{{.ID}}: {{.Created}} ago" +$ docker history --format "{{.ID}}: {{.CreatedAt}}" busybox -cc1b61406712: 2 weeks ago -: 2 weeks ago -: 2 weeks ago -: 2 weeks ago -: 2 weeks ago -: 3 weeks ago -: 3 weeks ago -: 3 weeks ago +f6e427c148a7: 4 weeks ago +: 4 weeks ago ```