From 6380142dd4c785580eae223f7abdd61f1f8e8423 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 30 Mar 2022 14:33:44 +0200 Subject: [PATCH] docs: fix (table) formatting, fix some broken links Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 885f44a5ba21a5c644b24f1f3367a375883fa1d8) Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/config_ls.md | 2 +- docs/reference/commandline/context.md | 45 +++++++++++++++++++ docs/reference/commandline/context_use.md | 1 + docs/reference/commandline/dockerd.md | 2 +- docs/reference/commandline/history.md | 14 +++--- docs/reference/commandline/images.md | 16 +++---- docs/reference/commandline/import.md | 7 ++- docs/reference/commandline/index.md | 18 ++++---- docs/reference/commandline/network_connect.md | 10 +++-- docs/reference/commandline/network_create.md | 2 +- docs/reference/commandline/network_ls.md | 22 ++++----- docs/reference/commandline/node_ls.md | 20 ++++----- docs/reference/commandline/node_ps.md | 20 ++++----- docs/reference/commandline/plugin_ls.md | 14 +++--- docs/reference/commandline/search.md | 2 +- docs/reference/commandline/secret_ls.md | 2 +- docs/reference/commandline/service_create.md | 19 ++++---- docs/reference/commandline/service_ls.md | 16 +++---- docs/reference/commandline/service_ps.md | 20 ++++----- docs/reference/commandline/stack_ls.md | 2 +- docs/reference/commandline/stack_ps.md | 20 ++++----- docs/reference/commandline/stack_services.md | 14 +++--- docs/reference/commandline/stats.md | 23 +++++----- docs/reference/commandline/system_df.md | 4 +- docs/reference/commandline/volume_ls.md | 16 +++---- 25 files changed, 189 insertions(+), 142 deletions(-) create mode 100644 docs/reference/commandline/context.md diff --git a/docs/reference/commandline/config_ls.md b/docs/reference/commandline/config_ls.md index 196203422c..3323b4bdf6 100644 --- a/docs/reference/commandline/config_ls.md +++ b/docs/reference/commandline/config_ls.md @@ -113,7 +113,7 @@ using a Go template. Valid placeholders for the Go template are listed below: | Placeholder | Description | -| ------------ | ------------------------------------------------------------------------------------ | +|--------------|--------------------------------------------------------------------------------------| | `.ID` | Config ID | | `.Name` | Config name | | `.CreatedAt` | Time when the config was created | diff --git a/docs/reference/commandline/context.md b/docs/reference/commandline/context.md new file mode 100644 index 0000000000..6d3420de7d --- /dev/null +++ b/docs/reference/commandline/context.md @@ -0,0 +1,45 @@ +--- +title: "context" +description: "The context command description and usage" +keywords: "context" +--- + +# config + +```markdown +Manage contexts + +Usage: +docker context [command] + +Available Commands: +create Create new context +export Export a context to a tar or kubeconfig file +import Import a context from a tar or zip file +inspect Display detailed information on one or more contexts +list List available contexts +rm Remove one or more contexts +show Print the current context +update Update a context +use Set the default context + +Flags: +-h, --help Help for context + +Use "docker context [command] --help" for more information about a command. +``` + +## Description + +Manage contexts. + +## Related commands + +* [context create](context_create.md) +* [context export](context_export.md) +* [context import](context_import.md) +* [context inspect](context_inspect.md) +* [context list](context_ls.md) +* [context rm](context_rm.md) +* [context update](context_update.md) +* [context use](context_use.md) diff --git a/docs/reference/commandline/context_use.md b/docs/reference/commandline/context_use.md index 17ed940c01..7e8d68a511 100644 --- a/docs/reference/commandline/context_use.md +++ b/docs/reference/commandline/context_use.md @@ -13,6 +13,7 @@ Set the current docker context ``` ## Description + Set the default context to use, when `DOCKER_HOST`, `DOCKER_CONTEXT` environment variables and `--host`, `--context` global options are not set. To disable usage of contexts, you can use the special `default` context. diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index f84f43a628..f0a7dd1166 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -773,7 +773,7 @@ time of writing, the following is the list of `libdm` log levels as well as their corresponding levels when output by `dockerd`. | `libdm` Level | Value | `--log-level` | -| ------------- | -----:| ------------- | +|---------------|------:|---------------| | `_LOG_FATAL` | 2 | error | | `_LOG_ERR` | 3 | error | | `_LOG_WARN` | 4 | warn | diff --git a/docs/reference/commandline/history.md b/docs/reference/commandline/history.md index bbff26df3b..26331b61eb 100644 --- a/docs/reference/commandline/history.md +++ b/docs/reference/commandline/history.md @@ -54,14 +54,14 @@ using a Go template. Valid placeholders for the Go template are listed below: -| Placeholder | Description | -| --------------- | ----------- | -| `.ID` | Image ID | +| Placeholder | Description | +|-----------------|-----------------------------------------------------------------------------------------------------------| +| `.ID` | Image ID | | `.CreatedSince` | Elapsed time since the image was created if `--human=true`, otherwise timestamp of when image was created | -| `.CreatedAt` | Timestamp of when image was created | -| `.CreatedBy` | Command that was used to create the image | -| `.Size` | Image disk size | -| `.Comment` | Comment for image | +| `.CreatedAt` | Timestamp of when image was created | +| `.CreatedBy` | Command that was used to create the image | +| `.Size` | Image disk size | +| `.Comment` | Comment for image | When using the `--format` option, the `history` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/images.md b/docs/reference/commandline/images.md index 5577de44be..cd9c12e2fb 100644 --- a/docs/reference/commandline/images.md +++ b/docs/reference/commandline/images.md @@ -293,15 +293,15 @@ using a Go template. Valid placeholders for the Go template are listed below: -| Placeholder | Description| -| ---- | ---- | -| `.ID` | Image ID | -| `.Repository` | Image repository | -| `.Tag` | Image tag | -| `.Digest` | Image digest | +| Placeholder | Description | +|-----------------|------------------------------------------| +| `.ID` | Image ID | +| `.Repository` | Image repository | +| `.Tag` | Image tag | +| `.Digest` | Image digest | | `.CreatedSince` | Elapsed time since the image was created | -| `.CreatedAt` | Time when the image was created | -| `.Size` | Image disk size | +| `.CreatedAt` | Time when the image was created | +| `.Size` | Image disk size | When using the `--format` option, the `image` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/import.md b/docs/reference/commandline/import.md index 5542f166d6..f4021e9311 100644 --- a/docs/reference/commandline/import.md +++ b/docs/reference/commandline/import.md @@ -28,16 +28,15 @@ specify an archive, Docker untars it in the container relative to the `/` the host. To import from a remote location, specify a `URI` that begins with the `http://` or `https://` protocol. -The `--change` option will apply `Dockerfile` instructions to the image -that is created. -Supported `Dockerfile` instructions: +The `--change` option applies `Dockerfile` instructions to the image that is +created. Supported `Dockerfile` instructions: `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR` ## Examples ### Import from a remote location -This will create a new untagged image. +This creates a new untagged image. ```console $ docker import https://example.com/exampleimage.tgz diff --git a/docs/reference/commandline/index.md b/docs/reference/commandline/index.md index 1d4e8c72c0..13a6a2d551 100644 --- a/docs/reference/commandline/index.md +++ b/docs/reference/commandline/index.md @@ -118,15 +118,15 @@ read the [`dockerd`](dockerd.md) reference page. ### Swarm management commands -| Command | Description | -|:--------|:-------------------------------------------------------------------| -| [swarm init](swarm_init.md) | Initialize a swarm | -| [swarm join](swarm_join.md) | Join a swarm as a manager node or worker node | -| [swarm leave](swarm_leave.md) | Remove the current node from the swarm | -| [swarm join-token](swarm_join_token.md) | Display or rotate join tokens | -| [swarm unlock](swarm_unlock.md) | Unlock swarm | -| [swarm unlock-key](swarm_unlock_key.md) | Manage the unlock key | -| [swarm update](swarm_update.md) | Update attributes of a swarm | +| Command | Description | +|:----------------------------------------|:----------------------------------------------| +| [swarm init](swarm_init.md) | Initialize a swarm | +| [swarm join](swarm_join.md) | Join a swarm as a manager node or worker node | +| [swarm leave](swarm_leave.md) | Remove the current node from the swarm | +| [swarm join-token](swarm_join-token.md) | Display or rotate join tokens | +| [swarm unlock](swarm_unlock.md) | Unlock swarm | +| [swarm unlock-key](swarm_unlock-key.md) | Manage the unlock key | +| [swarm update](swarm_update.md) | Update attributes of a swarm | ### Swarm service commands diff --git a/docs/reference/commandline/network_connect.md b/docs/reference/commandline/network_connect.md index f7b2fe5644..8ffb4b0520 100644 --- a/docs/reference/commandline/network_connect.md +++ b/docs/reference/commandline/network_connect.md @@ -36,7 +36,8 @@ $ docker network connect multi-host-network container1 ### Connect a container to a network when it starts -You can also use the `docker run --network=` option to start a container and immediately connect it to a network. +You can also use the `docker run --network=` option to start a +container and immediately connect it to a network. ```console $ docker run -itd --network=multi-host-network busybox @@ -87,14 +88,17 @@ $ docker network create --subnet 172.20.0.0/16 --ip-range 172.20.240.0/20 multi- $ docker network connect --ip 172.20.128.2 multi-host-network container2 ``` -To verify the container is connected, use the `docker network inspect` command. Use `docker network disconnect` to remove a container from the network. +To verify the container is connected, use the `docker network inspect` command. +Use `docker network disconnect` to remove a container from the network. Once connected in network, containers can communicate using only another container's IP address or name. For `overlay` networks or custom plugins that support multi-host connectivity, containers connected to the same multi-host network but launched from different Engines can also communicate in this way. -You can connect a container to one or more networks. The networks need not be the same type. For example, you can connect a single container bridge and overlay networks. +You can connect a container to one or more networks. The networks need not be +the same type. For example, you can connect a single container bridge and overlay +networks. ## Related commands diff --git a/docs/reference/commandline/network_create.md b/docs/reference/commandline/network_create.md index c3b68d37c0..d08f672805 100644 --- a/docs/reference/commandline/network_create.md +++ b/docs/reference/commandline/network_create.md @@ -184,7 +184,7 @@ network driver, again with their approximate equivalents to `docker daemon`. |--------------|----------------|--------------------------------------------| | `--gateway` | - | IPv4 or IPv6 Gateway for the master subnet | | `--ip-range` | `--fixed-cidr` | Allocate IPs from a range | -| `--internal` | - | Restrict external access to the network | +| `--internal` | - | Restrict external access to the network | | `--ipv6` | `--ipv6` | Enable IPv6 networking | | `--subnet` | `--bip` | Subnet for network | diff --git a/docs/reference/commandline/network_ls.md b/docs/reference/commandline/network_ls.md index 8b938b33be..0084b8fe8d 100644 --- a/docs/reference/commandline/network_ls.md +++ b/docs/reference/commandline/network_ls.md @@ -204,17 +204,17 @@ using a Go template. Valid placeholders for the Go template are listed below: -Placeholder | Description --------------|------------------------------------------------------------------------------------------ -`.ID` | Network ID -`.Name` | Network name -`.Driver` | Network driver -`.Scope` | Network scope (local, global) -`.IPv6` | Whether IPv6 is enabled on the network or not. -`.Internal` | Whether the network is internal or not. -`.Labels` | All labels assigned to the network. -`.Label` | Value of a specific label for this network. For example `{{.Label "project.version"}}` -`.CreatedAt` | Time when the network was created +| Placeholder | Description | +|--------------|----------------------------------------------------------------------------------------| +| `.ID` | Network ID | +| `.Name` | Network name | +| `.Driver` | Network driver | +| `.Scope` | Network scope (local, global) | +| `.IPv6` | Whether IPv6 is enabled on the network or not. | +| `.Internal` | Whether the network is internal or not. | +| `.Labels` | All labels assigned to the network. | +| `.Label` | Value of a specific label for this network. For example `{{.Label "project.version"}}` | +| `.CreatedAt` | Time when the network was created | When using the `--format` option, the `network ls` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/node_ls.md b/docs/reference/commandline/node_ls.md index 11e3296972..dec4550d89 100644 --- a/docs/reference/commandline/node_ls.md +++ b/docs/reference/commandline/node_ls.md @@ -177,16 +177,16 @@ using a Go template. Valid placeholders for the Go template are listed below: -Placeholder | Description ------------------|------------------------------------------------------------------------------------------ -`.ID` | Node ID -`.Self` | Node of the daemon (`true/false`, `true`indicates that the node is the same as current docker daemon) -`.Hostname` | Node hostname -`.Status` | Node status -`.Availability` | Node availability ("active", "pause", or "drain") -`.ManagerStatus` | Manager status of the node -`.TLSStatus` | TLS status of the node ("Ready", or "Needs Rotation" has TLS certificate signed by an old CA) -`.EngineVersion` | Engine version +| Placeholder | Description | +|------------------|-------------------------------------------------------------------------------------------------------| +| `.ID` | Node ID | +| `.Self` | Node of the daemon (`true/false`, `true`indicates that the node is the same as current docker daemon) | +| `.Hostname` | Node hostname | +| `.Status` | Node status | +| `.Availability` | Node availability ("active", "pause", or "drain") | +| `.ManagerStatus` | Manager status of the node | +| `.TLSStatus` | TLS status of the node ("Ready", or "Needs Rotation" has TLS certificate signed by an old CA) | +| `.EngineVersion` | Engine version | When using the `--format` option, the `node ls` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/node_ps.md b/docs/reference/commandline/node_ps.md index 45d5176341..ad1968d69d 100644 --- a/docs/reference/commandline/node_ps.md +++ b/docs/reference/commandline/node_ps.md @@ -115,16 +115,16 @@ using a Go template. Valid placeholders for the Go template are listed below: -Placeholder | Description -----------------|------------------------------------------------------------------------------------------ -`.ID` | Task ID -`.Name` | Task name -`.Image` | Task image -`.Node` | Node ID -`.DesiredState` | Desired state of the task (`running`, `shutdown`, or `accepted`) -`.CurrentState` | Current state of the task -`.Error` | Error -`.Ports` | Task published ports +| Placeholder | Description | +|-----------------|------------------------------------------------------------------| +| `.ID` | Task ID | +| `.Name` | Task name | +| `.Image` | Task image | +| `.Node` | Node ID | +| `.DesiredState` | Desired state of the task (`running`, `shutdown`, or `accepted`) | +| `.CurrentState` | Current state of the task | +| `.Error` | Error | +| `.Ports` | Task published ports | When using the `--format` option, the `node ps` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/plugin_ls.md b/docs/reference/commandline/plugin_ls.md index 47a657d9d8..44318345dc 100644 --- a/docs/reference/commandline/plugin_ls.md +++ b/docs/reference/commandline/plugin_ls.md @@ -75,13 +75,13 @@ using a Go template. Valid placeholders for the Go template are listed below: -Placeholder | Description --------------------|------------------------------------------------------------ -`.ID` | Plugin ID -`.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 +| Placeholder | Description | +|--------------------|-------------------------------------------------| +| `.ID` | Plugin ID | +| `.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 | When using the `--format` option, the `plugin ls` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/search.md b/docs/reference/commandline/search.md index 51587921e9..d5020b3b5c 100644 --- a/docs/reference/commandline/search.md +++ b/docs/reference/commandline/search.md @@ -140,7 +140,7 @@ using a Go template. Valid placeholders for the Go template are: | Placeholder | Description | -| -------------- | --------------------------------- | +|----------------|-----------------------------------| | `.Name` | Image Name | | `.Description` | Image description | | `.StarCount` | Number of stars for the image | diff --git a/docs/reference/commandline/secret_ls.md b/docs/reference/commandline/secret_ls.md index 395af6102e..0aed72c8c1 100644 --- a/docs/reference/commandline/secret_ls.md +++ b/docs/reference/commandline/secret_ls.md @@ -113,7 +113,7 @@ using a Go template. Valid placeholders for the Go template are listed below: | Placeholder | Description | -| ------------ | ------------------------------------------------------------------------------------ | +|--------------|--------------------------------------------------------------------------------------| | `.ID` | Secret ID | | `.Name` | Secret name | | `.CreatedAt` | Time when the secret was created | diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md index 77f8caf4bd..b038658db6 100644 --- a/docs/reference/commandline/service_create.md +++ b/docs/reference/commandline/service_create.md @@ -670,16 +670,15 @@ or _exclude_ (`!=`) rule. Multiple constraints find nodes that satisfy every expression (AND match). Constraints can match node or Docker Engine labels as follows: -node attribute | matches | example ----------------------|--------------------------------|----------------------------------------------- -`node.id` | Node ID | `node.id==2ivku8v2gvtg4` -`node.hostname` | Node hostname | `node.hostname!=node-2` -`node.role` | Node role (`manager`/`worker`) | `node.role==manager` -`node.platform.os` | Node operating system | `node.platform.os==windows` -`node.platform.arch` | Node architecture | `node.platform.arch==x86_64` -`node.labels` | User-defined node labels | `node.labels.security==high` -`engine.labels` | Docker Engine's labels | `engine.labels.operatingsystem==ubuntu-14.04` - +| node attribute | matches | example | +|----------------------|--------------------------------|-----------------------------------------------| +| `node.id` | Node ID | `node.id==2ivku8v2gvtg4` | +| `node.hostname` | Node hostname | `node.hostname!=node-2` | +| `node.role` | Node role (`manager`/`worker`) | `node.role==manager` | +| `node.platform.os` | Node operating system | `node.platform.os==windows` | +| `node.platform.arch` | Node architecture | `node.platform.arch==x86_64` | +| `node.labels` | User-defined node labels | `node.labels.security==high` | +| `engine.labels` | Docker Engine's labels | `engine.labels.operatingsystem==ubuntu-14.04` | `engine.labels` apply to Docker Engine labels like operating system, drivers, etc. Swarm administrators add `node.labels` for operational purposes by using diff --git a/docs/reference/commandline/service_ls.md b/docs/reference/commandline/service_ls.md index 97f7763abe..bf6d43f813 100644 --- a/docs/reference/commandline/service_ls.md +++ b/docs/reference/commandline/service_ls.md @@ -130,14 +130,14 @@ using a Go template. Valid placeholders for the Go template are listed below: -Placeholder | Description -------------|------------------------------------------------------------------------------------------ -`.ID` | Service ID -`.Name` | Service name -`.Mode` | Service mode (replicated, global) -`.Replicas` | Service replicas -`.Image` | Service image -`.Ports` | Service ports published in ingress mode +| Placeholder | Description | +|-------------|-----------------------------------------| +| `.ID` | Service ID | +| `.Name` | Service name | +| `.Mode` | Service mode (replicated, global) | +| `.Replicas` | Service replicas | +| `.Image` | Service image | +| `.Ports` | Service ports published in ingress mode | When using the `--format` option, the `service ls` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/service_ps.md b/docs/reference/commandline/service_ps.md index 2e0ba6bef5..bd661f71c5 100644 --- a/docs/reference/commandline/service_ps.md +++ b/docs/reference/commandline/service_ps.md @@ -157,16 +157,16 @@ using a Go template. Valid placeholders for the Go template are listed below: -Placeholder | Description -----------------|------------------------------------------------------------------------------------------ -`.ID` | Task ID -`.Name` | Task name -`.Image` | Task image -`.Node` | Node ID -`.DesiredState` | Desired state of the task (`running`, `shutdown`, or `accepted`) -`.CurrentState` | Current state of the task -`.Error` | Error -`.Ports` | Task published ports +| Placeholder | Description | +|-----------------|------------------------------------------------------------------| +| `.ID` | Task ID | +| `.Name` | Task name | +| `.Image` | Task image | +| `.Node` | Node ID | +| `.DesiredState` | Desired state of the task (`running`, `shutdown`, or `accepted`) | +| `.CurrentState` | Current state of the task | +| `.Error` | Error | +| `.Ports` | Task published ports | When using the `--format` option, the `service ps` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/stack_ls.md b/docs/reference/commandline/stack_ls.md index 96a42e7298..02f1a25cad 100644 --- a/docs/reference/commandline/stack_ls.md +++ b/docs/reference/commandline/stack_ls.md @@ -52,7 +52,7 @@ The formatting option (`--format`) pretty-prints stacks using a Go template. Valid placeholders for the Go template are listed below: | Placeholder | Description | -| --------------- | ------------------ | +|-----------------|--------------------| | `.Name` | Stack name | | `.Services` | Number of services | | `.Orchestrator` | Orchestrator name | diff --git a/docs/reference/commandline/stack_ps.md b/docs/reference/commandline/stack_ps.md index a427eeb8a1..3780f8f433 100644 --- a/docs/reference/commandline/stack_ps.md +++ b/docs/reference/commandline/stack_ps.md @@ -129,16 +129,16 @@ The formatting options (`--format`) pretty-prints tasks output using a Go templa Valid placeholders for the Go template are listed below: -Placeholder | Description -----------------|------------------------------------------------------------------------------------------ -`.ID` | Task ID -`.Name` | Task name -`.Image` | Task image -`.Node` | Node ID -`.DesiredState` | Desired state of the task (`running`, `shutdown`, or `accepted`) -`.CurrentState` | Current state of the task -`.Error` | Error -`.Ports` | Task published ports +| Placeholder | Description | +|-----------------|------------------------------------------------------------------| +| `.ID` | Task ID | +| `.Name` | Task name | +| `.Image` | Task image | +| `.Node` | Node ID | +| `.DesiredState` | Desired state of the task (`running`, `shutdown`, or `accepted`) | +| `.CurrentState` | Current state of the task | +| `.Error` | Error | +| `.Ports` | Task published ports | When using the `--format` option, the `stack ps` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/stack_services.md b/docs/reference/commandline/stack_services.md index d689e728cb..b6e143fc03 100644 --- a/docs/reference/commandline/stack_services.md +++ b/docs/reference/commandline/stack_services.md @@ -88,13 +88,13 @@ using a Go template. Valid placeholders for the Go template are listed below: -Placeholder | Description -------------|------------------------------------------------------------------- -`.ID` | Service ID -`.Name` | Service name -`.Mode` | Service mode (replicated, global) -`.Replicas` | Service replicas -`.Image` | Service image +| Placeholder | Description | +|-------------|-----------------------------------| +| `.ID` | Service ID | +| `.Name` | Service name | +| `.Mode` | Service mode (replicated, global) | +| `.Replicas` | Service replicas | +| `.Image` | Service image | When using the `--format` option, the `stack services` command will either output the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/stats.md b/docs/reference/commandline/stats.md index 754a2f2316..71d28353a5 100644 --- a/docs/reference/commandline/stats.md +++ b/docs/reference/commandline/stats.md @@ -138,18 +138,17 @@ using a Go template. Valid placeholders for the Go template are listed below: -Placeholder | Description ------------- | -------------------------------------------- -`.Container` | Container name or ID (user input) -`.Name` | Container name -`.ID` | Container ID -`.CPUPerc` | CPU percentage -`.MemUsage` | Memory usage -`.NetIO` | Network IO -`.BlockIO` | Block IO -`.MemPerc` | Memory percentage (Not available on Windows) -`.PIDs` | Number of PIDs (Not available on Windows) - +| Placeholder | Description | +|--------------|----------------------------------------------| +| `.Container` | Container name or ID (user input) | +| `.Name` | Container name | +| `.ID` | Container ID | +| `.CPUPerc` | CPU percentage | +| `.MemUsage` | Memory usage | +| `.NetIO` | Network IO | +| `.BlockIO` | Block IO | +| `.MemPerc` | Memory percentage (Not available on Windows) | +| `.PIDs` | Number of PIDs (Not available on Windows) | When using the `--format` option, the `stats` command either outputs the data exactly as the template declares or, when using the diff --git a/docs/reference/commandline/system_df.md b/docs/reference/commandline/system_df.md index a5f1e6d23d..1adb3749b0 100644 --- a/docs/reference/commandline/system_df.md +++ b/docs/reference/commandline/system_df.md @@ -87,7 +87,7 @@ using a Go template. Valid placeholders for the Go template are listed below: | Placeholder | Description | -| -------------- | ------------------------------------------ | +|----------------|--------------------------------------------| | `.Type` | `Images`, `Containers` and `Local Volumes` | | `.TotalCount` | Total number of items | | `.Active` | Number of active items | @@ -122,7 +122,7 @@ Local Volumes 150.3 MB 150.3 MB (100%) ``` -**Note** the format option is meaningless when verbose is true. +The format option has no effect when the `--verbose` option is used. ## Related commands * [system prune](system_prune.md) diff --git a/docs/reference/commandline/volume_ls.md b/docs/reference/commandline/volume_ls.md index f010cfd605..37d5cc37b6 100644 --- a/docs/reference/commandline/volume_ls.md +++ b/docs/reference/commandline/volume_ls.md @@ -158,14 +158,14 @@ using a Go template. Valid placeholders for the Go template are listed below: -Placeholder | Description ---------------|------------------------------------------------------------------------------------------ -`.Name` | Volume name -`.Driver` | Volume driver -`.Scope` | Volume scope (local, global) -`.Mountpoint` | The mount point of the volume on the host -`.Labels` | All labels assigned to the volume -`.Label` | Value of a specific label for this volume. For example `{{.Label "project.version"}}` +| Placeholder | Description | +|---------------|---------------------------------------------------------------------------------------| +| `.Name` | Volume name | +| `.Driver` | Volume driver | +| `.Scope` | Volume scope (local, global) | +| `.Mountpoint` | The mount point of the volume on the host | +| `.Labels` | All labels assigned to the volume | +| `.Label` | Value of a specific label for this volume. For example `{{.Label "project.version"}}` | When using the `--format` option, the `volume ls` command will either output the data exactly as the template declares or, when using the