From 9c9ff4369d36519a930803eac61d97f44ab03b09 Mon Sep 17 00:00:00 2001 From: Simon Heimberg Date: Thu, 6 Dec 2018 11:55:10 +0100 Subject: [PATCH 1/2] list state `ready` for filtering in stack_ps.md Signed-off-by: SimonHeimberg (cherry picked from commit 6a20e87ae8e32287523bd5aa75ec63d670762ea5) Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 4840a8dfbe36ad778d5a186ef670eb9e125888a2) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/stack_ps.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/commandline/stack_ps.md b/docs/reference/commandline/stack_ps.md index 81cadc16a0..bc0f27efc5 100644 --- a/docs/reference/commandline/stack_ps.md +++ b/docs/reference/commandline/stack_ps.md @@ -103,7 +103,7 @@ tz6j82jnwrx7 voting_db.1 postgres:9.4 #### desired-state -The `desired-state` filter can take the values `running`, `shutdown`, or `accepted`. +The `desired-state` filter can take the values `running`, `shutdown`, `ready` or `accepted`. ```bash $ docker stack ps -f "desired-state=running" voting From ac7723056a70e05c11f0b5485a4d0c0151f97b16 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 18 Jun 2020 16:37:36 +0200 Subject: [PATCH 2/2] docs: fix example output for docker plugin ls The output format was changed to combine tag and name in a single column, but this change was never reflected in the docs. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit c253918eaf2151f33cbf670488c82842ba3264c2) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/plugin_create.md | 4 ++-- docs/reference/commandline/plugin_disable.md | 8 ++++---- docs/reference/commandline/plugin_enable.md | 8 ++++---- docs/reference/commandline/plugin_install.md | 4 ++-- docs/reference/commandline/plugin_ls.md | 8 ++++---- docs/reference/commandline/plugin_push.md | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/reference/commandline/plugin_create.md b/docs/reference/commandline/plugin_create.md index 010f654b5c..b56df04aa0 100644 --- a/docs/reference/commandline/plugin_create.md +++ b/docs/reference/commandline/plugin_create.md @@ -38,8 +38,8 @@ plugin $ docker plugin ls -ID NAME TAG DESCRIPTION ENABLED -672d8144ec02 plugin latest A sample plugin for Docker false +ID NAME DESCRIPTION ENABLED +672d8144ec02 plugin:latest A sample plugin for Docker false ``` The plugin can subsequently be enabled for local use or pushed to the public registry. diff --git a/docs/reference/commandline/plugin_disable.md b/docs/reference/commandline/plugin_disable.md index 3f55cddc83..927b6d5801 100644 --- a/docs/reference/commandline/plugin_disable.md +++ b/docs/reference/commandline/plugin_disable.md @@ -30,8 +30,8 @@ and enabled: ```bash $ docker plugin ls -ID NAME TAG DESCRIPTION ENABLED -69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker true +ID NAME DESCRIPTION ENABLED +69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker true ``` To disable the plugin, use the following command: @@ -43,8 +43,8 @@ tiborvass/sample-volume-plugin $ docker plugin ls -ID NAME TAG DESCRIPTION ENABLED -69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker false +ID NAME DESCRIPTION ENABLED +69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker false ``` ## Related commands diff --git a/docs/reference/commandline/plugin_enable.md b/docs/reference/commandline/plugin_enable.md index c4e546b988..2f6a5f5198 100644 --- a/docs/reference/commandline/plugin_enable.md +++ b/docs/reference/commandline/plugin_enable.md @@ -29,8 +29,8 @@ but disabled: ```bash $ docker plugin ls -ID NAME TAG DESCRIPTION ENABLED -69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker false +ID NAME DESCRIPTION ENABLED +69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker false ``` To enable the plugin, use the following command: @@ -42,8 +42,8 @@ tiborvass/sample-volume-plugin $ docker plugin ls -ID NAME TAG DESCRIPTION ENABLED -69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker true +ID NAME DESCRIPTION ENABLED +69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker true ``` ## Related commands diff --git a/docs/reference/commandline/plugin_install.md b/docs/reference/commandline/plugin_install.md index 2b34b963f0..4028cc17c1 100644 --- a/docs/reference/commandline/plugin_install.md +++ b/docs/reference/commandline/plugin_install.md @@ -49,8 +49,8 @@ After the plugin is installed, it appears in the list of plugins: ```bash $ docker plugin ls -ID NAME TAG DESCRIPTION ENABLED -69553ca1d123 vieux/sshfs latest sshFS plugin for Docker true +ID NAME DESCRIPTION ENABLED +69553ca1d123 vieux/sshfs:latest sshFS plugin for Docker true ``` ## Related commands diff --git a/docs/reference/commandline/plugin_ls.md b/docs/reference/commandline/plugin_ls.md index 3261fec8d9..dedd2270dc 100644 --- a/docs/reference/commandline/plugin_ls.md +++ b/docs/reference/commandline/plugin_ls.md @@ -34,8 +34,8 @@ Refer to the [filtering](#filtering) section for more information about availabl ```bash $ docker plugin ls -ID NAME TAG DESCRIPTION ENABLED -69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker true +ID NAME DESCRIPTION ENABLED +69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker true ``` ### Filtering @@ -65,7 +65,7 @@ Installed plugin vieux/sshfs $ docker plugin ls --filter enabled=true -NAME TAG DESCRIPTION ENABLED +ID NAME DESCRIPTION ENABLED ``` ### Formatting @@ -78,7 +78,7 @@ Valid placeholders for the Go template are listed below: Placeholder | Description -------------------|------------------------------------------------------------ `.ID` | Plugin ID -`.Name` | Plugin name +`.Name` | Plugin name and tag `.Description` | Plugin description `.Enabled` | Whether plugin is enabled or not `.PluginReference` | The reference used to push/pull from a registry diff --git a/docs/reference/commandline/plugin_push.md b/docs/reference/commandline/plugin_push.md index 87687a23ba..02e862026b 100644 --- a/docs/reference/commandline/plugin_push.md +++ b/docs/reference/commandline/plugin_push.md @@ -29,8 +29,8 @@ The following example shows how to push a sample `user/plugin`. ```bash $ docker plugin ls -ID NAME TAG DESCRIPTION ENABLED -69553ca1d456 user/plugin latest A sample plugin for Docker false +ID NAME DESCRIPTION ENABLED +69553ca1d456 user/plugin:latest A sample plugin for Docker false $ docker plugin push user/plugin ```