Favor docker <object> <verb> format of commands (docker#5914)

Remove instances of:
- docker rmi
- docker images
- docker stop
- docker rm
- docker create
- docker exec
- docker attach

Author: Misty Stanley-Jones

compose/install.md

@@ -216,7 +216,7 @@ Alternatively, if you're not worried about keeping them, you can remove them.
 Compose just creates new ones.
 
 ```bash
-docker rm -f -v myapp_web_1 myapp_db_1 ...
+docker container rm -f -v myapp_web_1 myapp_db_1 ...
 ```
 
 ## Uninstallation

config/containers/logging/gelf.md

@@ -61,7 +61,7 @@ To make the configuration permanent, you can configure it in `/etc/docker/daemon
 ```
 
 You can set the logging driver for a specific container by setting the
-`--log-driver` flag when using `docker create` or `docker run`:
+`--log-driver` flag when using `docker container create` or `docker run`:
 
 ```bash
 $ docker run \

config/containers/logging/json-file.md

@@ -37,7 +37,7 @@ option.
 Restart Docker for the changes to take effect for newly created containers. Existing containers do not use the new logging configuration.
 
 You can set the logging driver for a specific container by using the
-`--log-driver` flag to `docker create` or `docker run`:
+`--log-driver` flag to `docker container create` or `docker run`:
 
 ```bash
 $ docker run \

config/containers/logging/syslog.md

@@ -57,7 +57,7 @@ Restart Docker for the changes to take effect.
 > **Note**: The syslog-address supports both UDP and TCP.
 
 You can set the logging driver for a specific container by using the
-`--log-driver` flag to `docker create` or `docker run`:
+`--log-driver` flag to `docker container create` or `docker run`:
 
 ```bash
 docker run \

config/thirdparty/ambassador_pattern_linking.md

@@ -124,7 +124,7 @@ containers `env`:
 This environment is used by the ambassador `socat` script to expose Redis
 to the world (via the `-p 6379:6379` port mapping):
 
-    $ docker rm redis_ambassador
+    $ docker container rm redis_ambassador
     $ CMD="apk update && apk add socat && sh"
     $ docker run -t -i --link redis:redis --name redis_ambassador -p 6379:6379 alpine:3.2 sh -c "$CMD"
     [...]

config/thirdparty/dsc.md

@@ -90,7 +90,7 @@ file and execute configurations against multiple nodes as such:
 
 ### Images
 Image configuration is equivalent to running: `docker pull [image]` or
-`docker rmi -f [IMAGE]`.
+`docker image rm -f [IMAGE]`.
 
 Using the same steps defined above, execute `DockerClient` with the `Image`
 parameter and apply the configuration:
@@ -124,7 +124,7 @@ docker run -d --name="[containername]" -p '[port]' -e '[env]' --link '[link]'\
 or
 
 ```
-docker rm -f [containername]
+docker container rm -f [containername]
 ```
 
 To create or remove containers, you can use the `Container` parameter with one

develop/develop-images/multistage-build.md

@@ -69,9 +69,9 @@ echo Building alexellis2/href-counter:build
 docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \  
     -t alexellis2/href-counter:build . -f Dockerfile.build
 
-docker create --name extract alexellis2/href-counter:build  
-docker cp extract:/go/src/github.com/alexellis/href-counter/app ./app  
-docker rm -f extract
+docker container create --name extract alexellis2/href-counter:build  
+docker container cp extract:/go/src/github.com/alexellis/href-counter/app ./app  
+docker container rm -f extract
 
 echo Building alexellis2/href-counter:latest
 

develop/sdk/examples.md

@@ -437,7 +437,7 @@ Reticulating spline 5...
 
 ## List all images
 
-List the images on your Engine, similar to `docker images`:
+List the images on your Engine, similar to `docker image ls`:
 
 <ul class="nav nav-tabs">
   <li class="active"><a data-toggle="tab" data-target="#tab-listimages-go" data-group="go">Go</a></li>

docker-for-mac/index.md

@@ -88,15 +88,15 @@ docker-machine version 0.10.0, build 76ed2a6
 
     The `nginx` webserver continues to run in the container on that port
     until you stop and/or remove the container. If you want to stop the
-    webserver, type: `docker stop webserver` and start it again with `docker
+    webserver, type: `docker container stop webserver` and start it again with `docker
     start webserver`. A stopped container does not show up with `docker ps`; for
     that, you need to run `docker ps -a`.
 
     To stop and remove the running container with a single command, type:
-    `docker rm -f webserver`. This removes the container, but not the
-    `nginx` image. You can list local images with `docker images`. You might
+    `docker container rm -f webserver`. This removes the container, but not the
+    `nginx` image. You can list local images with `docker image ls`. You might
     want to keep some images around so that you don't need to pull them again
-    from Docker Hub. To remove an image you no longer need, use `docker rmi` followed by an image ID or image name. For example, `docker rmi nginx`.
+    from Docker Hub. To remove an image you no longer need, use `docker image rm` followed by an image ID or image name. For example, `docker image rm nginx`.
 
 **Want more example applications?** [Get Started](/get-started/) and [Samples](/samples/) are great places to start.
 

docker-for-windows/index.md

@@ -228,14 +228,14 @@ and make sure `docker` commands are working properly.
 
     The `nginx` webserver continues to run in the container on that port
     until you stop and/or remove the container. If you want to stop the
-    webserver, type: `docker stop webserver` and start it again with `docker
+    webserver, type: `docker container stop webserver` and start it again with `docker
     start webserver`.
 
     To stop and remove the running container with a single command, type:
-    `docker rm -f webserver`. This removes the container, but not the
-    `nginx` image. You can list local images with `docker images`. You might
+    `docker container rm -f webserver`. This removes the container, but not the
+    `nginx` image. You can list local images with `docker image ls`. You might
     want to keep some images around so that you don't need to pull them again
-    from Docker Hub. To remove an image you no longer need, use `docker rmi` followed by an image ID or image name. For example, `docker rmi nginx`.
+    from Docker Hub. To remove an image you no longer need, use `docker image rm` followed by an image ID or image name. For example, `docker image rm nginx`.
 
 **Want more example applications?** [Get Started](/get-started/) and [Samples](/samples) are great places to start.
 

engine/docker-overview.md

@@ -193,7 +193,7 @@ the default registry configuration):
 1.  If you do not have the `ubuntu` image locally, Docker pulls it from your
     configured registry, as though you had run `docker pull ubuntu` manually.
 
-2.  Docker creates a new container, as though you had run a `docker create`
+2.  Docker creates a new container, as though you had run a `docker container create`
     command manually.
 
 3.  Docker allocates a read-write filesystem to the container, as its final

engine/examples/apt-cacher-ng.md

@@ -116,6 +116,6 @@ instruction, and the image we built to run the service:
 Finally, clean up after your test by stopping and removing the
 container, and then removing the image.
 
-    $ docker stop test_apt_cacher_ng
-    $ docker rm test_apt_cacher_ng
-    $ docker rmi eg_apt_cacher_ng
+    $ docker container stop test_apt_cacher_ng
+    $ docker container rm test_apt_cacher_ng
+    $ docker image rm eg_apt_cacher_ng

engine/examples/running_ssh_service.md

@@ -76,7 +76,7 @@ Finally, clean up after your test by stopping and removing the
 container, and then removing the image.
 
 ```bash
-$ docker stop test_sshd
-$ docker rm test_sshd
-$ docker rmi eg_sshd
+$ docker container stop test_sshd
+$ docker container rm test_sshd
+$ docker image rm eg_sshd
 ```

engine/security/apparmor.md

@@ -13,7 +13,7 @@ Docker automatically generates and loads a default profile for containers named
 `docker-default`. On Docker versions `1.13.0` and later, the Docker binary generates
 this profile in `tmpfs` and then loads it into the kernel. On Docker versions
 earlier than `1.13.0`, this profile is generated in `/etc/apparmor.d/docker`
-instead. 
+instead.
 
 > **Note**: This profile is used on containers, _not_ on the Docker Daemon.
 
@@ -176,7 +176,7 @@ profile docker-nginx flags=(attach_disconnected,mediate_deleted) {
 4. Exec into the running container.
 
    ```bash
-   $ docker exec -it apparmor-nginx bash
+   $ docker container exec -it apparmor-nginx bash
    ```
 
 5. Try some operations to test the profile.
@@ -222,7 +222,7 @@ In the above example, you can see `profile=/usr/bin/docker`. This means the
 user has the `docker-engine` (Docker Engine Daemon) profile loaded.
 
 > **Note**: On version of Ubuntu > 14.04 this is all fine and well, but Trusty
-> users might run into some issues when trying to `docker exec`.
+> users might run into some issues when trying to `docker container exec`.
 
 Look at another log line:
 

engine/security/trust/trust_sandbox.md

@@ -127,7 +127,7 @@ Now that everything is setup, you can go into your `trustsandbox` container and
 start testing Docker content trust. From your host machine, obtain a shell
 in the `trustsandbox` container.
 
-    $ docker exec -it trustsandbox sh
+    $ docker container exec -it trustsandbox sh
     / #
 
 ### Test some trust operations
@@ -217,7 +217,7 @@ data. Then, you try and pull it.
 2.  Open a new interactive terminal from your host, and obtain a shell into the
     `sandboxregistry` container.
 
-        $ docker exec -it sandboxregistry bash
+        $ docker container exec -it sandboxregistry bash
         root@65084fc6f047:/#
 
 3.  List the layers for the `test/trusttest` image you pushed:
@@ -242,15 +242,15 @@ data. Then, you try and pull it.
 
 7.  List the `trusttest` image.
 
-        / # docker images | grep trusttest
+        / # docker image ls | grep trusttest
         REPOSITORY                            TAG                 IMAGE ID            CREATED             SIZE
         docker/trusttest                      latest              cc7629d1331a        11 months ago       5.025 MB
         sandboxregistry:5000/test/trusttest   latest              cc7629d1331a        11 months ago       5.025 MB
         sandboxregistry:5000/test/trusttest   <none>              cc7629d1331a        11 months ago       5.025 MB
 
 8.  Remove the `trusttest:latest` image from our local cache.
 
-        / # docker rmi -f cc7629d1331a
+        / # docker image rm -f cc7629d1331a
         Untagged: docker/trusttest:latest
         Untagged: sandboxregistry:5000/test/trusttest:latest
         Untagged: sandboxregistry:5000/test/trusttest@sha256:ebf59c538accdf160ef435f1a19938ab8c0d6bd96aef8d4ddd1b379edf15a926

engine/security/userns-remap.md

@@ -243,7 +243,7 @@ See
 for some of these limitations.
 
 To disable user namespaces for a specific container, add the `--userns=host`
-flag to the `docker create`, `docker run`, or `docker exec` command.
+flag to the `docker container create`, `docker container run`, or `docker container exec` command.
 
 ## User namespace known limitations
 

engine/swarm/configs.md

@@ -158,7 +158,7 @@ real-world example, continue to
     ```
 
 4.  Get the ID of the `redis` service task container using `docker ps`, so that
-    you can use `docker exec` to connect to the container and read the contents
+    you can use `docker container exec` to connect to the container and read the contents
     of the config data file, which defaults to being readable by all and has the
     same name as the name of the config. The first command below illustrates
     how to find the container ID, and the second and third commands use shell
@@ -169,11 +169,11 @@ real-world example, continue to
 
     5cb1c2348a59
 
-    $ docker exec $(docker ps --filter name=redis -q) ls -l /my-config
+    $ docker container exec $(docker ps --filter name=redis -q) ls -l /my-config
 
     -r--r--r--    1 root     root            12 Jun  5 20:49 my-config                                                     
 
-    $ docker exec $(docker ps --filter name=redis -q) cat /my-config
+    $ docker container exec $(docker ps --filter name=redis -q) cat /my-config
 
     This is a config
     ```
@@ -207,7 +207,7 @@ real-world example, continue to
     `service update` command redeploys the service.
 
     ```none
-    $ docker exec -it $(docker ps --filter name=redis -q) cat /my-config
+    $ docker container exec -it $(docker ps --filter name=redis -q) cat /my-config
 
     cat: can't open '/my-config': No such file or directory
     ```

engine/swarm/secrets.md

@@ -197,7 +197,7 @@ real-world example, continue to
     ```
 
 4.  Get the ID of the `redis` service task container using `docker ps` , so that
-    you can use `docker exec` to connect to the container and read the contents
+    you can use `docker container exec` to connect to the container and read the contents
     of the secret data file, which defaults to being readable by all and has the
     same name as the name of the secret. The first command below illustrates
     how to find the container ID, and the second and third commands use shell
@@ -208,12 +208,12 @@ real-world example, continue to
 
     5cb1c2348a59
 
-    $ docker exec $(docker ps --filter name=redis -q) ls -l /run/secrets
+    $ docker container exec $(docker ps --filter name=redis -q) ls -l /run/secrets
 
     total 4
     -r--r--r--    1 root     root            17 Dec 13 22:48 my_secret_data
 
-    $ docker exec $(docker ps --filter name=redis -q) cat /run/secrets/my_secret_data
+    $ docker container exec $(docker ps --filter name=redis -q) cat /run/secrets/my_secret_data
 
     This is a secret
     ```
@@ -257,7 +257,7 @@ real-world example, continue to
     `service update` command redeploys the service.
 
     ```none
-    $ docker exec -it $(docker ps --filter name=redis -q) cat /run/secrets/my_secret_data
+    $ docker container exec -it $(docker ps --filter name=redis -q) cat /run/secrets/my_secret_data
 
     cat: can't open '/run/secrets/my_secret_data': No such file or directory
     ```
@@ -898,14 +898,14 @@ use it, then remove the old secret.
     uses shell expansion to do it all in a single step.
 
     ```bash
-    $ docker exec <CONTAINER_ID> \
+    $ docker container exec <CONTAINER_ID> \
         bash -c 'mysqladmin --user=wordpress --password="$(< /run/secrets/old_mysql_password)" password "$(< /run/secrets/mysql_password)"'
     ```
 
     **or**:
 
     ```bash
-    $ docker exec $(docker ps --filter name=mysql -q) \
+    $ docker container exec $(docker ps --filter name=mysql -q) \
         bash -c 'mysqladmin --user=wordpress --password="$(< /run/secrets/old_mysql_password)" password "$(< /run/secrets/mysql_password)"'
     ```
 

engine/tutorials/networkingcontainers.md

@@ -175,7 +175,7 @@ Then, get the IP address of your `web`
 
 Now, open a shell to your running `db` container:
 
-    $ docker exec -it db bash
+    $ docker container exec -it db bash
 
     root@a205f0dd33b2:/# ping 172.17.0.2
     ping 172.17.0.2
@@ -195,7 +195,7 @@ Docker networking allows you to attach a container to as many networks as you li
 
 Open a shell into the `db` application again and try the ping command. This time just use the container name `web` rather than the IP address.
 
-    $ docker exec -it db bash
+    $ docker container exec -it db bash
 
     root@a205f0dd33b2:/# ping web
     PING web (10.0.0.2) 56(84) bytes of data.

engine/userguide/networking/default_network/dockerlinks.md

@@ -145,7 +145,7 @@ You can also use `docker inspect` to return the container's name.
 > **Note**:
 > Container names must be unique. That means you can only call
 > one container `web`. If you want to re-use a container name you must delete
-> the old container (with `docker rm`) before you can create a new
+> the old container (with `docker container rm`) before you can create a new
 > container with the same name. As an alternative you can use the `--rm`
 > flag with the `docker run` command. This deletes the container
 > immediately after it is stopped.
@@ -166,7 +166,7 @@ image, which contains a PostgreSQL database.
 Now, you need to delete the `web` container you created previously so you can replace it
 with a linked one:
 
-    $ docker rm -f web
+    $ docker container rm -f web
 
 Now, create a new `web` container and link it with your `db` container.
 

engine/userguide/networking/index.md

@@ -77,7 +77,7 @@ container lacks a network interface. Attaching to such a container and looking
 at its stack you see this:
 
 ```bash
-$ docker attach nonenetcontainer
+$ docker container attach nonenetcontainer
 
 root@0cb243cd1293:/# cat /etc/hosts
 127.0.0.1	localhost
@@ -223,7 +223,7 @@ inside the container. You are connected as `root`, so your command prompt is
 a `#` character.
 
 ```none
-$ docker attach container1
+$ docker container attach container1
 
 root@3386a527aa08:/# ip -4 addr
 

engine/userguide/networking/overlay-standalone-swarm.md

@@ -381,7 +381,7 @@ to have external connectivity outside of their cluster.
 2.  Check the Nginx container's network interfaces.
 
     ```bash
-    $ docker exec web ip addr
+    $ docker container exec web ip addr
 
     1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default
     link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00