From 4b025d06059a54fe87a436efac63b829a551b1d5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 23 Feb 2017 19:39:28 +0100 Subject: [PATCH 1/5] Merge pull request #30731 from shin-/plugin_privileges_param_fix Parameter name in GetPluginPrivileges is "remote" (cherry picked from commit 8d28fc8fc4db3c89d20679a022ea9cb5d3644b44) Signed-off-by: Sebastiaan van Stijn --- api/swagger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/swagger.yaml b/api/swagger.yaml index 3676284b94..78ab198eda 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -6503,7 +6503,7 @@ paths: schema: $ref: "#/definitions/ErrorResponse" parameters: - - name: "name" + - name: "remote" in: "query" description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted." required: true From 05b81bc152b408f481f5d189d8bb878262dec205 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 15 Feb 2017 09:45:44 +0100 Subject: [PATCH 2/5] Merge pull request #30832 from allencloud/update-swaggeryml-on-cluster-status-code remove 400 and 404 for get nodes endpoint and add 503 for secret update (cherry picked from commit e8b92f154d68d17a09fa62ef8cd1b72163887c58) Signed-off-by: Sebastiaan van Stijn --- api/swagger.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/api/swagger.yaml b/api/swagger.yaml index 78ab198eda..4399dd688a 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -6834,14 +6834,6 @@ paths: type: "array" items: $ref: "#/definitions/Node" - 400: - description: "bad parameter" - schema: - $ref: "#/definitions/ErrorResponse" - 404: - description: "no such node" - schema: - $ref: "#/definitions/ErrorResponse" 500: description: "server error" schema: @@ -7936,6 +7928,10 @@ paths: description: "server error" schema: $ref: "#/definitions/ErrorResponse" + 503: + description: "node is not part of a swarm" + schema: + $ref: "#/definitions/ErrorResponse" parameters: - name: "id" in: "path" From ef658fa65ecc41eea65b85c6a51a7b839a164d1b Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Thu, 23 Feb 2017 10:47:26 -0500 Subject: [PATCH 3/5] Merge pull request #31291 from albers/docs-daemon-hosts Clarify why `hosts` in `daemon.json` does not work (cherry picked from commit 27c9a6e9c22a6cf0c6dae7f59cf8f7d56a67f560) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/dockerd.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index f515dc7cb8..02ae647785 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -1205,6 +1205,13 @@ This is a full example of the allowed configuration options on Linux: } ``` +> **Note:** You cannot set options in `daemon.json` that have already been set on +> daemon startup as a flag. +> On systems that use `systemd` to start the Docker daemon, `-H` is already set, so +> you cannot use the `hosts` key in `daemon.json` to add listening addresses. +> See https://docs.docker.com/engine/admin/systemd/#custom-docker-daemon-options for how +> to accomplish this task with a systemd drop-in file. + ##### On Windows The default location of the configuration file on Windows is From 9f55f97a5a0e9cb5cd725a9db5d681c897f22dcb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 27 Feb 2017 23:08:47 +0100 Subject: [PATCH 4/5] Merge pull request #31398 from pjaffe/patch-1 Remove incorrect duplicate phrase from build.md (cherry picked from commit fb5ccc66054df1459d7844e237a2aaae085ec274) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/build.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md index b141e7422e..5de623a0e3 100644 --- a/docs/reference/commandline/build.md +++ b/docs/reference/commandline/build.md @@ -111,9 +111,6 @@ Build Syntax Suffix | Commit Used | Build Context Used If you pass an URL to a remote tarball, the URL itself is sent to the daemon: -Instead of specifying a context, you can pass a single Dockerfile in the `URL` -or pipe the file in via `STDIN`. To pipe a Dockerfile from `STDIN`: - ```bash $ docker build http://server/context.tar.gz ``` From de692b10655cf744a5d3a3840c2fefd5f3e461df Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 2 Mar 2017 08:27:12 +0100 Subject: [PATCH 5/5] Merge pull request #31467 from thaJeztah/remove-jekyll-markers remove Jekyll tags from CLI reference (cherry picked from commit 9321a12115466a46013dd2258cd9ad658d303c48) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/cli.md | 2 -- docs/reference/commandline/commit.md | 2 -- docs/reference/commandline/container_prune.md | 4 ---- docs/reference/commandline/events.md | 4 ---- docs/reference/commandline/image_prune.md | 2 -- docs/reference/commandline/images.md | 4 ---- docs/reference/commandline/info.md | 1 - docs/reference/commandline/inspect.md | 14 -------------- docs/reference/commandline/node_inspect.md | 2 -- docs/reference/commandline/plugin_inspect.md | 2 -- docs/reference/commandline/plugin_ls.md | 2 -- docs/reference/commandline/plugin_set.md | 8 -------- docs/reference/commandline/ps.md | 10 +--------- docs/reference/commandline/run.md | 4 ---- docs/reference/commandline/secret_inspect.md | 2 -- docs/reference/commandline/service_create.md | 4 +--- docs/reference/commandline/service_inspect.md | 2 -- docs/reference/commandline/service_ls.md | 2 -- docs/reference/commandline/stack_services.md | 2 -- docs/reference/commandline/stats.md | 4 ---- docs/reference/commandline/version.md | 4 ---- docs/reference/commandline/volume_inspect.md | 2 -- docs/reference/commandline/volume_ls.md | 2 -- 23 files changed, 2 insertions(+), 83 deletions(-) diff --git a/docs/reference/commandline/cli.md b/docs/reference/commandline/cli.md index c1e1aafbe6..3b4577ad7e 100644 --- a/docs/reference/commandline/cli.md +++ b/docs/reference/commandline/cli.md @@ -168,7 +168,6 @@ attach`, `docker exec`, `docker run` or `docker start` command. Following is a sample `config.json` file: ```json -{% raw %} { "HttpHeaders": { "MyHeader": "MyValue" @@ -184,7 +183,6 @@ Following is a sample `config.json` file: "unicorn.example.com": "vcbait" } } -{% endraw %} ``` ### Notary diff --git a/docs/reference/commandline/commit.md b/docs/reference/commandline/commit.md index fcf7559199..22c98e310e 100644 --- a/docs/reference/commandline/commit.md +++ b/docs/reference/commandline/commit.md @@ -72,7 +72,6 @@ svendowideit/testimage version3 f5283438590d 16 sec ### Commit a container with new configurations ```bash -{% raw %} $ docker ps ICONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES @@ -90,7 +89,6 @@ f5283438590d $ docker inspect -f "{{ .Config.Env }}" f5283438590d [HOME=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin DEBUG=true] -{% endraw %} ``` ### Commit a container with new `CMD` and `EXPOSE` instructions diff --git a/docs/reference/commandline/container_prune.md b/docs/reference/commandline/container_prune.md index 345186b0d7..9d9802566d 100644 --- a/docs/reference/commandline/container_prune.md +++ b/docs/reference/commandline/container_prune.md @@ -68,7 +68,6 @@ fraction of a second no more than nine digits long. The following removes containers created more than 5 minutes ago: ```bash -{% raw %} $ docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}}\t{{.Status}}' CONTAINER ID IMAGE COMMAND CREATED AT STATUS @@ -86,13 +85,11 @@ $ docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}} CONTAINER ID IMAGE COMMAND CREATED AT STATUS 61b9efa71024 busybox "sh" 2017-01-04 13:23:33 -0800 PST Exited (0) 44 seconds ago -{% endraw %} ``` The following removes containers created before `2017-01-04T13:10:00`: ```bash -{% raw %} $ docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}}\t{{.Status}}' CONTAINER ID IMAGE COMMAND CREATED AT STATUS @@ -110,7 +107,6 @@ $ docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}} CONTAINER ID IMAGE COMMAND CREATED AT STATUS 53a9bc23a516 busybox "sh" 2017-01-04 13:11:59 -0800 PST Exited (0) 9 minutes ago -{% endraw %} ``` ## Related commands diff --git a/docs/reference/commandline/events.md b/docs/reference/commandline/events.md index d4599adcc5..9bf051363a 100644 --- a/docs/reference/commandline/events.md +++ b/docs/reference/commandline/events.md @@ -326,7 +326,6 @@ $ docker events --filter 'type=plugin' ### Format the output ```bash -{% raw %} $ docker events --filter 'type=container' --format 'Type={{.Type}} Status={{.Status}} ID={{.ID}}' Type=container Status=create ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26 @@ -335,13 +334,11 @@ Type=container Status=start ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c1 Type=container Status=resize ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26 Type=container Status=die ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26 Type=container Status=destroy ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26 -{% endraw %} ``` #### Format as JSON ```none -{% raw %} $ docker events --format '{{json .}}' {"status":"create","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4.. @@ -349,5 +346,4 @@ Type=container Status=destroy ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299 {"Type":"network","Action":"connect","Actor":{"ID":"1b50a5bf755f6021dfa78e.. {"status":"start","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f42.. {"status":"resize","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4.. -{% endraw %} ``` diff --git a/docs/reference/commandline/image_prune.md b/docs/reference/commandline/image_prune.md index 12b5b01111..1e16f811be 100644 --- a/docs/reference/commandline/image_prune.md +++ b/docs/reference/commandline/image_prune.md @@ -91,7 +91,6 @@ fraction of a second no more than nine digits long. The following removes images created before `2017-01-04T00:00:00`: ```bash -{% raw %} $ docker images --format 'table {{.Repository}}\t{{.Tag}}\t{{.ID}}\t{{.CreatedAt}}\t{{.Size}}' REPOSITORY TAG IMAGE ID CREATED AT SIZE foo latest 2f287ac753da 2017-01-04 13:42:23 -0800 PST 3.98 MB @@ -114,7 +113,6 @@ $ docker images --format 'table {{.Repository}}\t{{.Tag}}\t{{.ID}}\t{{.CreatedAt REPOSITORY TAG IMAGE ID CREATED AT SIZE foo latest 2f287ac753da 2017-01-04 13:42:23 -0800 PST 3.98 MB -{% endraw %} ``` The following removes images created more than 10 days (`240h`) ago: diff --git a/docs/reference/commandline/images.md b/docs/reference/commandline/images.md index e0e55524c0..82c572e3ba 100644 --- a/docs/reference/commandline/images.md +++ b/docs/reference/commandline/images.md @@ -309,7 +309,6 @@ The following example uses a template without headers and outputs the `ID` and `Repository` entries separated by a colon for all images: ```bash -{% raw %} $ docker images --format "{{.ID}}: {{.Repository}}" 77af4d6b9913: @@ -321,14 +320,12 @@ b6fa739cedf5: committ 746b819f315e: postgres 746b819f315e: postgres 746b819f315e: postgres -{% endraw %} ``` To list all images with their repository and tag in a table format you can use: ```bash -{% raw %} $ docker images --format "table {{.ID}}\t{{.Repository}}\t{{.Tag}}" IMAGE ID REPOSITORY TAG @@ -341,5 +338,4 @@ b6fa739cedf5 committ latest 746b819f315e postgres 9.3 746b819f315e postgres 9.3.5 746b819f315e postgres latest -{% endraw %} ``` diff --git a/docs/reference/commandline/info.md b/docs/reference/commandline/info.md index aba4d190dd..798c3f04da 100644 --- a/docs/reference/commandline/info.md +++ b/docs/reference/commandline/info.md @@ -197,7 +197,6 @@ The global `-D` option causes all `docker` commands to output debug information. You can also specify the output format: ```bash -{% raw %} $ docker info --format '{{json .}}' {"ID":"I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S","Containers":14, ...} diff --git a/docs/reference/commandline/inspect.md b/docs/reference/commandline/inspect.md index dfea20a57a..842faf9b49 100644 --- a/docs/reference/commandline/inspect.md +++ b/docs/reference/commandline/inspect.md @@ -45,33 +45,25 @@ For the most part, you can pick out any field from the JSON in a fairly straightforward manner. ```bash -{% raw %} $ docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $INSTANCE_ID -{% endraw %} ``` ### Get an instance's MAC address ```bash -{% raw %} $ docker inspect --format='{{range .NetworkSettings.Networks}}{{.MacAddress}}{{end}}' $INSTANCE_ID -{% endraw %} ``` ### Get an instance's log path ```bash -{% raw %} $ docker inspect --format='{{.LogPath}}' $INSTANCE_ID -{% endraw %} ``` ### Get an instance's image name ```bash -{% raw %} $ docker inspect --format='{{.Container.Spec.Image}}' $INSTANCE_ID -{% endraw %} ``` ### List all port bindings @@ -80,9 +72,7 @@ You can loop over arrays and maps in the results to produce simple text output: ```bash -{% raw %} $ docker inspect --format='{{range $p, $conf := .NetworkSettings.Ports}} {{$p}} -> {{(index $conf 0).HostPort}} {{end}}' $INSTANCE_ID -{% endraw %} ``` ### Find a specific port mapping @@ -96,9 +86,7 @@ then `index` 0 contains the first object inside of that. Then we ask for the `HostPort` field to get the public address. ```bash -{% raw %} $ docker inspect --format='{{(index (index .NetworkSettings.Ports "8787/tcp") 0).HostPort}}' $INSTANCE_ID -{% endraw %} ``` ### Get a subsection in JSON format @@ -109,7 +97,5 @@ Docker adds a template function, `json`, which can be applied to get results in JSON format. ```bash -{% raw %} $ docker inspect --format='{{json .Config}}' $INSTANCE_ID -{% endraw %} ``` diff --git a/docs/reference/commandline/node_inspect.md b/docs/reference/commandline/node_inspect.md index 2ff6971742..b958e3dd4e 100644 --- a/docs/reference/commandline/node_inspect.md +++ b/docs/reference/commandline/node_inspect.md @@ -109,7 +109,6 @@ $ docker node inspect swarm-manager ### Specify an output format ```none -{% raw %} $ docker node inspect --format '{{ .ManagerStatus.Leader }}' self false @@ -136,7 +135,6 @@ Plugins: Network: overlay, bridge, null, host, overlay Volume: local Engine Version: 1.12.0 -{% endraw %} ``` ## Related commands diff --git a/docs/reference/commandline/plugin_inspect.md b/docs/reference/commandline/plugin_inspect.md index 3a54b9f99b..c0e6573cb8 100644 --- a/docs/reference/commandline/plugin_inspect.md +++ b/docs/reference/commandline/plugin_inspect.md @@ -148,11 +148,9 @@ $ docker plugin inspect tiborvass/sample-volume-plugin:latest ### Formatting the output ```bash -{% raw %} $ docker plugin inspect -f '{{.Id}}' tiborvass/sample-volume-plugin:latest 8c74c978c434745c3ade82f1bc0acf38d04990eaf494fa507c16d9f1daa99c21 -{% endraw %} ``` diff --git a/docs/reference/commandline/plugin_ls.md b/docs/reference/commandline/plugin_ls.md index 9c44b48b53..e55f363fd7 100644 --- a/docs/reference/commandline/plugin_ls.md +++ b/docs/reference/commandline/plugin_ls.md @@ -96,11 +96,9 @@ The following example uses a template without headers and outputs the `ID` and `Name` entries separated by a colon for all plugins: ```bash -{% raw %} $ docker plugin ls --format "{{.ID}}: {{.Name}}" 4be01827a72e: tiborvass/no-remove -{% endraw %} ``` diff --git a/docs/reference/commandline/plugin_set.md b/docs/reference/commandline/plugin_set.md index e63215a7ed..4b7ce612ad 100644 --- a/docs/reference/commandline/plugin_set.md +++ b/docs/reference/commandline/plugin_set.md @@ -42,7 +42,6 @@ The following example change the env variable `DEBUG` on the `sample-volume-plugin` plugin. ```bash -{% raw %} $ docker plugin inspect -f {{.Settings.Env}} tiborvass/sample-volume-plugin [DEBUG=0] @@ -51,7 +50,6 @@ $ docker plugin set tiborvass/sample-volume-plugin DEBUG=1 $ docker plugin inspect -f {{.Settings.Env}} tiborvass/sample-volume-plugin [DEBUG=1] -{% endraw %} ``` ### Change the source of a mount @@ -60,7 +58,6 @@ The following example change the source of the `mymount` mount on the `myplugin` plugin. ```bash -{% raw %} $ docker plugin inspect -f '{{with $mount := index .Settings.Mounts 0}}{{$mount.Source}}{{end}}' myplugin /foo @@ -68,7 +65,6 @@ $ docker plugins set myplugin mymount.source=/bar $ docker plugin inspect -f '{{with $mount := index .Settings.Mounts 0}}{{$mount.Source}}{{end}}' myplugin /bar -{% endraw %} ``` > **Note**: Since only `source` is settable in `mymount`, @@ -80,7 +76,6 @@ The following example change the path of the `mydevice` device on the `myplugin` plugin. ```bash -{% raw %} $ docker plugin inspect -f '{{with $device := index .Settings.Devices 0}}{{$device.Path}}{{end}}' myplugin /dev/foo @@ -88,7 +83,6 @@ $ docker plugins set myplugin mydevice.path=/dev/bar $ docker plugin inspect -f '{{with $device := index .Settings.Devices 0}}{{$device.Path}}{{end}}' myplugin /dev/bar -{% endraw %} ``` > **Note**: Since only `path` is settable in `mydevice`, @@ -99,7 +93,6 @@ $ docker plugin inspect -f '{{with $device := index .Settings.Devices 0}}{{$devi The following example change the source of the args on the `myplugin` plugin. ```bash -{% raw %} $ docker plugin inspect -f '{{.Settings.Args}}' myplugin ["foo", "bar"] @@ -107,7 +100,6 @@ $ docker plugins set myplugin args="foo bar baz" $ docker plugin inspect -f '{{.Settings.Args}}' myplugin ["foo", "bar", "baz"] -{% endraw %} ``` ## Related commands diff --git a/docs/reference/commandline/ps.md b/docs/reference/commandline/ps.md index 9fb5222513..536b9e55f4 100644 --- a/docs/reference/commandline/ps.md +++ b/docs/reference/commandline/ps.md @@ -296,7 +296,6 @@ The `volume` filter shows only containers that mount a specific volume or have a volume mounted in a specific path: ```bash -{% raw %} $ docker ps --filter volume=remote-volume --format "table {{.ID}}\t{{.Mounts}}" CONTAINER ID MOUNTS 9c3527ed70ce remote-volume @@ -304,7 +303,6 @@ CONTAINER ID MOUNTS $ docker ps --filter volume=/data --format "table {{.ID}}\t{{.Mounts}}" CONTAINER ID MOUNTS 9c3527ed70ce remote-volume -{% endraw %} ``` #### network @@ -330,9 +328,7 @@ example shows all containers that are attached to the `net1` network, using the network id as a filter; ```bash -{% raw %} $ docker network inspect --format "{{.ID}}" net1 -{% endraw %} 8c0b4110ae930dbe26b258de9bc34a03f98056ed6f27f991d32919bfe401d7c5 @@ -399,7 +395,7 @@ Placeholder | Description `.Size` | Container disk size. `.Names` | Container names. `.Labels` | All labels assigned to the container. -`.Label` | Value of a specific label for this container. For example `'{% raw %}{{.Label "com.docker.swarm.cpu"}}{% endraw %}'` +`.Label` | Value of a specific label for this container. For example `'{{.Label "com.docker.swarm.cpu"}}'` `.Mounts` | Names of the volumes mounted in this container. `.Networks` | Names of the networks attached to this container. @@ -411,9 +407,7 @@ The following example uses a template without headers and outputs the `ID` and `Command` entries separated by a colon for all running containers: ```bash -{% raw %} $ docker ps --format "{{.ID}}: {{.Command}}" -{% endraw %} a87ecb4f327c: /bin/sh -c #(nop) MA 01946d9d34d8: /bin/sh -c #(nop) MA @@ -424,9 +418,7 @@ c1d3b0166030: /bin/sh -c yum -y up To list all running containers with their labels in a table format you can use: ```bash -{% raw %} $ docker ps --format "table {{.ID}}\t{{.Labels}}" -{% endraw %} CONTAINER ID LABELS a87ecb4f327c com.docker.swarm.node=ubuntu,com.docker.swarm.storage=ssd diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md index 1ec6bf98cf..6ea5356ef2 100644 --- a/docs/reference/commandline/run.md +++ b/docs/reference/commandline/run.md @@ -542,7 +542,6 @@ retrieve the container's ID once the container has finished running. ### Add host device to container (--device) ```bash -{% raw %} $ docker run --device=/dev/sdc:/dev/xvdc \ --device=/dev/sdd --device=/dev/zero:/dev/nulo \ -i -t \ @@ -551,7 +550,6 @@ $ docker run --device=/dev/sdc:/dev/xvdc \ brw-rw---- 1 root disk 8, 2 Feb 9 16:05 /dev/xvdc brw-rw---- 1 root disk 8, 3 Feb 9 16:05 /dev/sdd crw-rw-rw- 1 root root 1, 5 Feb 9 16:05 /dev/nulo -{% endraw %} ``` It is often necessary to directly expose devices to a container. The `--device` @@ -635,10 +633,8 @@ using IPv4 or IPv6 networking in your containers. Use the following flags for IPv4 address retrieval for a network device named `eth0`: ```bash -{% raw %} $ HOSTIP=`ip -4 addr show scope global dev eth0 | grep inet | awk '{print \$2}' | cut -d / -f 1` $ docker run --add-host=docker:${HOSTIP} --rm -it debian -{% endraw %} ``` For IPv6 use the `-6` flag instead of the `-4` flag. For other network diff --git a/docs/reference/commandline/secret_inspect.md b/docs/reference/commandline/secret_inspect.md index 8ced58d783..098274e17b 100644 --- a/docs/reference/commandline/secret_inspect.md +++ b/docs/reference/commandline/secret_inspect.md @@ -75,11 +75,9 @@ secret. The following example command outputs the creation time of the secret. ```bash -{% raw %} $ docker secret inspect --format='{{.CreatedAt}}' mhv17xfe3gh6xc4rij5orpfds 2016-10-27 23:25:43.909181089 +0000 UTC -{% endraw %} ``` diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md index 4dd65c0ce1..79fbdc9348 100644 --- a/docs/reference/commandline/service_create.md +++ b/docs/reference/commandline/service_create.md @@ -546,9 +546,8 @@ In this example, we are going to set the template of the created containers base service's name and the node's ID where it sits. ```bash -{% raw %} $ docker service create --name hosttempl \ - --hostname={% raw %}"{{.Node.ID}}-{{.Service.Name}}"\ + --hostname="{{.Node.ID}}-{{.Service.Name}}"\ busybox top va8ew30grofhjoychbr6iot8c @@ -561,7 +560,6 @@ wo41w8hg8qan hosttempl.1 busybox:latest@sha256:29f5d56d12684887bdfa50dcd29fc31 $ docker inspect --format="{{.Config.Hostname}}" hosttempl.1.wo41w8hg8qanxwjwsg4kxpprj x3ti0erg11rjpg64m75kej2mz-hosttempl -{% endraw %} ``` ## Related commands diff --git a/docs/reference/commandline/service_inspect.md b/docs/reference/commandline/service_inspect.md index c36047c589..b2088d2248 100644 --- a/docs/reference/commandline/service_inspect.md +++ b/docs/reference/commandline/service_inspect.md @@ -150,11 +150,9 @@ service. For example, the following command outputs the number of replicas of the "redis" service. ```bash -{% raw %} $ docker service inspect --format='{{.Spec.Mode.Replicated.Replicas}}' redis 10 -{% endraw %} ``` diff --git a/docs/reference/commandline/service_ls.md b/docs/reference/commandline/service_ls.md index 2258b5b52f..06dd92dfa9 100644 --- a/docs/reference/commandline/service_ls.md +++ b/docs/reference/commandline/service_ls.md @@ -135,12 +135,10 @@ The following example uses a template without headers and outputs the `ID`, `Mode`, and `Replicas` entries separated by a colon for all services: ```bash -{% raw %} $ docker service ls --format "{{.ID}}: {{.Mode}} {{.Replicas}}" 0zmvwuiu3vue: replicated 10/10 fm6uf97exkul: global 5/5 -{% endraw %} ``` ## Related commands diff --git a/docs/reference/commandline/stack_services.md b/docs/reference/commandline/stack_services.md index 74af825840..c97e78b62d 100644 --- a/docs/reference/commandline/stack_services.md +++ b/docs/reference/commandline/stack_services.md @@ -89,12 +89,10 @@ The following example uses a template without headers and outputs the `ID`, `Mode`, and `Replicas` entries separated by a colon for all services: ```bash -{% raw %} $ docker stack services --format "{{.ID}}: {{.Mode}} {{.Replicas}}" 0zmvwuiu3vue: replicated 10/10 fm6uf97exkul: global 5/5 -{% endraw %} ``` diff --git a/docs/reference/commandline/stats.md b/docs/reference/commandline/stats.md index 0a2428983d..55d5a444af 100644 --- a/docs/reference/commandline/stats.md +++ b/docs/reference/commandline/stats.md @@ -107,25 +107,21 @@ The following example uses a template without headers and outputs the `Container` and `CPUPerc` entries separated by a colon for all images: ```bash -{% raw %} $ docker stats --format "{{.Container}}: {{.CPUPerc}}" 09d3bb5b1604: 6.61% 9db7aa4d986d: 9.19% 3f214c61ad1d: 0.00% -{% endraw %} ``` To list all containers statistics with their name, CPU percentage and memory usage in a table format you can use: ```bash -{% raw %} $ docker stats --format "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}" CONTAINER CPU % PRIV WORKING SET 1285939c1fd3 0.07% 796 KiB / 64 MiB 9c76f7834ae2 0.07% 2.746 MiB / 64 MiB d1ea048f04e4 0.03% 4.583 MiB / 64 MiB -{% endraw %} ``` diff --git a/docs/reference/commandline/version.md b/docs/reference/commandline/version.md index c2693886b9..b15d13b97f 100644 --- a/docs/reference/commandline/version.md +++ b/docs/reference/commandline/version.md @@ -60,19 +60,15 @@ OS/Arch: linux/amd64 ### Get the server version ```bash -{% raw %} $ docker version --format '{{.Server.Version}}' 1.8.0 -{% endraw %} ``` ### Dump raw JSON data ```bash -{% raw %} $ docker version --format '{{json .}}' {"Client":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"},"ServerOK":true,"Server":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","KernelVersion":"3.13.2-gentoo","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"}} -{% endraw %} ``` diff --git a/docs/reference/commandline/volume_inspect.md b/docs/reference/commandline/volume_inspect.md index 530c2b1feb..bbdc6bd3ee 100644 --- a/docs/reference/commandline/volume_inspect.md +++ b/docs/reference/commandline/volume_inspect.md @@ -48,10 +48,8 @@ $ docker volume inspect 85bffb0677236974f93955d8ecc4df55ef5070117b0e53333cc1b443 } ] -{% raw %} $ docker volume inspect --format '{{ .Mountpoint }}' 85bffb0677236974f93955d8ecc4df55ef5070117b0e53333cc1b443777be24d /var/lib/docker/volumes/85bffb0677236974f93955d8ecc4df55ef5070117b0e53333cc1b443777be24d/_data -{% endraw %} ``` ## Related commands diff --git a/docs/reference/commandline/volume_ls.md b/docs/reference/commandline/volume_ls.md index 9f9f972d03..c35e662aaa 100644 --- a/docs/reference/commandline/volume_ls.md +++ b/docs/reference/commandline/volume_ls.md @@ -183,13 +183,11 @@ The following example uses a template without headers and outputs the `Name` and `Driver` entries separated by a colon for all volumes: ```bash -{% raw %} $ docker volume ls --format "{{.Name}}: {{.Driver}}" vol1: local vol2: local vol3: local -{% endraw %} ``` ## Related commands