diff --git a/_data/engine-cli/docker_commit.yaml b/_data/engine-cli/docker_commit.yaml index 54a54a90c60b..affa9f2109b1 100644 --- a/_data/engine-cli/docker_commit.yaml +++ b/_data/engine-cli/docker_commit.yaml @@ -61,7 +61,7 @@ examples: |- ```bash $ docker ps - ICONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES + CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES c3f279d17e0a ubuntu:12.04 /bin/bash 7 days ago Up 25 hours desperate_dubinsky 197387f1b436 ubuntu:12.04 /bin/bash 7 days ago Up 25 hours focused_hamilton diff --git a/_data/engine-cli/docker_container.yaml b/_data/engine-cli/docker_container.yaml index 1b4eb1313f6f..9906350b3978 100644 --- a/_data/engine-cli/docker_container.yaml +++ b/_data/engine-cli/docker_container.yaml @@ -1,6 +1,6 @@ command: docker container short: Manage containers -long: Manage containers +long: Manage containers. usage: docker container pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_image.yaml b/_data/engine-cli/docker_image.yaml index 3dc4445aac25..29fa42091ec6 100644 --- a/_data/engine-cli/docker_image.yaml +++ b/_data/engine-cli/docker_image.yaml @@ -1,6 +1,6 @@ command: docker image short: Manage images -long: Manage images +long: Manage images. usage: docker image pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_images.yaml b/_data/engine-cli/docker_images.yaml index 48f9f7ee307e..d0c638c6d20f 100644 --- a/_data/engine-cli/docker_images.yaml +++ b/_data/engine-cli/docker_images.yaml @@ -143,6 +143,7 @@ examples: |- * label (`label=` or `label==`) * before (`[:]`, `` or ``) - filter images created before given id or references * since (`[:]`, `` or ``) - filter images created since given id or references + * reference (pattern of an image reference) - filter images whose reference matches the specified pattern #### Show untagged images (dangling) diff --git a/_data/engine-cli/docker_inspect.yaml b/_data/engine-cli/docker_inspect.yaml index 2a468a92a1e2..3c7619cbc079 100644 --- a/_data/engine-cli/docker_inspect.yaml +++ b/_data/engine-cli/docker_inspect.yaml @@ -45,7 +45,7 @@ examples: |- ### Get an instance's image name ```bash - $ docker inspect --format='{{.Container.Spec.Image}}' $INSTANCE_ID + $ docker inspect --format='{{.Config.Image}}' $INSTANCE_ID ``` ### List all port bindings diff --git a/_data/engine-cli/docker_network.yaml b/_data/engine-cli/docker_network.yaml index 6dc75571fcd4..bf5462197773 100644 --- a/_data/engine-cli/docker_network.yaml +++ b/_data/engine-cli/docker_network.yaml @@ -1,6 +1,8 @@ command: docker network short: Manage networks -long: Manage networks +long: |- + Manage networks. You can use subcommands to create, inspect, list, remove, + connect and disconnect networks. usage: docker network pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_node.yaml b/_data/engine-cli/docker_node.yaml index 450d959e0da2..6fbd014c8567 100644 --- a/_data/engine-cli/docker_node.yaml +++ b/_data/engine-cli/docker_node.yaml @@ -1,6 +1,6 @@ command: docker node short: Manage Swarm nodes -long: Manage Swarm nodes +long: Manage nodes. usage: docker node pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_plugin.yaml b/_data/engine-cli/docker_plugin.yaml index 52c3ade3af24..8ad61ccc9138 100644 --- a/_data/engine-cli/docker_plugin.yaml +++ b/_data/engine-cli/docker_plugin.yaml @@ -1,6 +1,6 @@ command: docker plugin short: Manage plugins -long: Manage plugins +long: Manage plugins. usage: docker plugin pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_ps.yaml b/_data/engine-cli/docker_ps.yaml index 74051e49cd4c..5ea6ef952eca 100644 --- a/_data/engine-cli/docker_ps.yaml +++ b/_data/engine-cli/docker_ps.yaml @@ -357,7 +357,7 @@ examples: |- ``` The following filter matches all containers that have exposed UDP port `80`: - + ```bash $ docker ps --filter publish=80/udp diff --git a/_data/engine-cli/docker_push.yaml b/_data/engine-cli/docker_push.yaml index 90638cff359b..04fb0ba8b314 100644 --- a/_data/engine-cli/docker_push.yaml +++ b/_data/engine-cli/docker_push.yaml @@ -4,18 +4,24 @@ long: |- Use `docker push` to share your images to the [Docker Hub](https://hub.docker.com) registry or to a self-hosted one. - Refer to the [`docker tag`](tag.md) reference for more information about valid - image and tag names. + Refer to the [`docker tag`](tag.md) reference for more + information about valid image and tag names. - Killing the `docker push` process, for example by pressing `CTRL-c` while it is - running in a terminal, terminates the push operation. + Killing the `docker push` process, for example by pressing `CTRL-c` while it + is running in a terminal, terminates the push operation. + + Progress bars are shown during docker push, which show the + uncompressed size. The actual amount of data that's pushed will be compressed + before sending, so the uploaded + size will not be reflected by the progress bar. Registry credentials are managed by [docker login](login.md). ### Concurrent uploads - By default the Docker daemon will push five layers of an image at a time. - If you are on a low bandwidth connection this may cause timeout issues and you may want to lower + By default the Docker daemon will push five layers of an image at a time. If + you are on a low bandwidth connection this may cause timeout issues and you may + want to lower this via the `--max-concurrent-uploads` daemon option. See the [daemon documentation](dockerd.md) for more details. usage: docker push [OPTIONS] NAME[:TAG] diff --git a/_data/engine-cli/docker_secret.yaml b/_data/engine-cli/docker_secret.yaml index c2b4e2473886..8e1097128860 100644 --- a/_data/engine-cli/docker_secret.yaml +++ b/_data/engine-cli/docker_secret.yaml @@ -1,6 +1,6 @@ command: docker secret short: Manage Docker secrets -long: Manage Docker secrets +long: Manage secrets. usage: docker secret pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_secret_create.yaml b/_data/engine-cli/docker_secret_create.yaml index 373e6ea96a54..e5874492ed40 100644 --- a/_data/engine-cli/docker_secret_create.yaml +++ b/_data/engine-cli/docker_secret_create.yaml @@ -1,8 +1,11 @@ command: docker secret create short: Create a secret from a file or STDIN as content long: |- - 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/). usage: docker secret create [OPTIONS] SECRET file|- pname: docker secret plink: docker_secret.yaml diff --git a/_data/engine-cli/docker_secret_inspect.yaml b/_data/engine-cli/docker_secret_inspect.yaml index 20ff6f9e8e11..c9a1789bdb29 100644 --- a/_data/engine-cli/docker_secret_inspect.yaml +++ b/_data/engine-cli/docker_secret_inspect.yaml @@ -9,6 +9,8 @@ long: |- Go's [text/template](http://golang.org/pkg/text/template/) package describes all the details of the format. + + For detailed information about using secrets, refer to [manage sensitive data with Docker secrets](https://docs.docker.com/engine/swarm/secrets/). usage: docker secret inspect [OPTIONS] SECRET [SECRET...] pname: docker secret plink: docker_secret.yaml diff --git a/_data/engine-cli/docker_secret_ls.yaml b/_data/engine-cli/docker_secret_ls.yaml index 0a58026df98f..ef6fa96a30cb 100644 --- a/_data/engine-cli/docker_secret_ls.yaml +++ b/_data/engine-cli/docker_secret_ls.yaml @@ -1,7 +1,10 @@ command: docker secret ls aliases: list short: List secrets -long: Run this command on a manager node to list the secrets in the swarm. +long: |- + Run this command on a manager node to list the secrets in the swarm. + + For detailed information about using secrets, refer to [manage sensitive data with Docker secrets](https://docs.docker.com/engine/swarm/secrets/). usage: docker secret ls [OPTIONS] pname: docker secret plink: docker_secret.yaml diff --git a/_data/engine-cli/docker_secret_rm.yaml b/_data/engine-cli/docker_secret_rm.yaml index b348215fb311..0759d3c98c99 100644 --- a/_data/engine-cli/docker_secret_rm.yaml +++ b/_data/engine-cli/docker_secret_rm.yaml @@ -4,6 +4,8 @@ short: Remove one or more secrets long: |- Removes the specified secrets from the swarm. This command has to be run targeting a manager node. + + For detailed information about using secrets, refer to [manage sensitive data with Docker secrets](https://docs.docker.com/engine/swarm/secrets/). usage: docker secret rm SECRET [SECRET...] pname: docker secret plink: docker_secret.yaml diff --git a/_data/engine-cli/docker_service.yaml b/_data/engine-cli/docker_service.yaml index 792d1111e8b6..d99d94118daf 100644 --- a/_data/engine-cli/docker_service.yaml +++ b/_data/engine-cli/docker_service.yaml @@ -1,6 +1,6 @@ command: docker service short: Manage services -long: Manage services +long: Manage services. usage: docker service pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_service_create.yaml b/_data/engine-cli/docker_service_create.yaml index 3c5d12b8176f..575a8f88a5c1 100644 --- a/_data/engine-cli/docker_service_create.yaml +++ b/_data/engine-cli/docker_service_create.yaml @@ -605,8 +605,8 @@ examples: |- node.hostname != node-2 - node.role - node role: manager + node.role + Node role node.role == manager diff --git a/_data/engine-cli/docker_stack.yaml b/_data/engine-cli/docker_stack.yaml index 7e40b3117894..ad1d4ae6effc 100644 --- a/_data/engine-cli/docker_stack.yaml +++ b/_data/engine-cli/docker_stack.yaml @@ -1,6 +1,6 @@ command: docker stack short: Manage Docker stacks -long: Manage Docker stacks +long: Manage stacks. usage: docker stack pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_swarm.yaml b/_data/engine-cli/docker_swarm.yaml index eb05ffc45b1c..fc839c0186a3 100644 --- a/_data/engine-cli/docker_swarm.yaml +++ b/_data/engine-cli/docker_swarm.yaml @@ -1,6 +1,6 @@ command: docker swarm short: Manage Swarm -long: Manage Swarm +long: Manage the swarm. usage: docker swarm pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_system.yaml b/_data/engine-cli/docker_system.yaml index 4a4de17d27bc..12a585ecf807 100644 --- a/_data/engine-cli/docker_system.yaml +++ b/_data/engine-cli/docker_system.yaml @@ -1,6 +1,6 @@ command: docker system short: Manage Docker -long: Manage Docker +long: Manage Docker. usage: docker system pname: docker plink: docker.yaml diff --git a/_data/engine-cli/docker_volume.yaml b/_data/engine-cli/docker_volume.yaml index 31a08f2b61af..763e47da4595 100644 --- a/_data/engine-cli/docker_volume.yaml +++ b/_data/engine-cli/docker_volume.yaml @@ -1,22 +1,8 @@ command: docker volume short: Manage volumes -long: |2+ - - The **docker volume** command has subcommands for managing data volumes. A data - volume is a specially-designated directory that by-passes storage driver - management. - - Data volumes persist data independent of a container's life cycle. When you - delete a container, the Docker daemon does not delete any data volumes. You can - share volumes across multiple containers. Moreover, you can share data volumes - with other computing resources in your system. - - To see help for a subcommand, use: - - docker volume COMMAND --help - - For full details on using docker volume visit Docker's online documentation. - +long: |- + Manage volumes. You can use subcommands to create, inspect, list, remove + volumes. usage: docker volume COMMAND pname: docker plink: docker.yaml