Skip to content

Commit a17a47d

Browse files
author
Misty Stanley-Jones
authored
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
1 parent 0e06479 commit a17a47d

File tree

35 files changed

+93
-93
lines changed

35 files changed

+93
-93
lines changed

compose/install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ Alternatively, if you're not worried about keeping them, you can remove them.
216216
Compose just creates new ones.
217217

218218
```bash
219-
docker rm -f -v myapp_web_1 myapp_db_1 ...
219+
docker container rm -f -v myapp_web_1 myapp_db_1 ...
220220
```
221221

222222
## Uninstallation

config/containers/logging/gelf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ To make the configuration permanent, you can configure it in `/etc/docker/daemon
6161
```
6262

6363
You can set the logging driver for a specific container by setting the
64-
`--log-driver` flag when using `docker create` or `docker run`:
64+
`--log-driver` flag when using `docker container create` or `docker run`:
6565

6666
```bash
6767
$ docker run \

config/containers/logging/json-file.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ option.
3737
Restart Docker for the changes to take effect for newly created containers. Existing containers do not use the new logging configuration.
3838

3939
You can set the logging driver for a specific container by using the
40-
`--log-driver` flag to `docker create` or `docker run`:
40+
`--log-driver` flag to `docker container create` or `docker run`:
4141

4242
```bash
4343
$ docker run \

config/containers/logging/syslog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Restart Docker for the changes to take effect.
5757
> **Note**: The syslog-address supports both UDP and TCP.
5858
5959
You can set the logging driver for a specific container by using the
60-
`--log-driver` flag to `docker create` or `docker run`:
60+
`--log-driver` flag to `docker container create` or `docker run`:
6161

6262
```bash
6363
docker run \

config/thirdparty/ambassador_pattern_linking.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ containers `env`:
124124
This environment is used by the ambassador `socat` script to expose Redis
125125
to the world (via the `-p 6379:6379` port mapping):
126126

127-
$ docker rm redis_ambassador
127+
$ docker container rm redis_ambassador
128128
$ CMD="apk update && apk add socat && sh"
129129
$ docker run -t -i --link redis:redis --name redis_ambassador -p 6379:6379 alpine:3.2 sh -c "$CMD"
130130
[...]

config/thirdparty/dsc.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ file and execute configurations against multiple nodes as such:
9090

9191
### Images
9292
Image configuration is equivalent to running: `docker pull [image]` or
93-
`docker rmi -f [IMAGE]`.
93+
`docker image rm -f [IMAGE]`.
9494

9595
Using the same steps defined above, execute `DockerClient` with the `Image`
9696
parameter and apply the configuration:
@@ -124,7 +124,7 @@ docker run -d --name="[containername]" -p '[port]' -e '[env]' --link '[link]'\
124124
or
125125

126126
```
127-
docker rm -f [containername]
127+
docker container rm -f [containername]
128128
```
129129

130130
To create or remove containers, you can use the `Container` parameter with one

develop/develop-images/multistage-build.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ echo Building alexellis2/href-counter:build
6969
docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \
7070
-t alexellis2/href-counter:build . -f Dockerfile.build
7171

72-
docker create --name extract alexellis2/href-counter:build
73-
docker cp extract:/go/src/github.com/alexellis/href-counter/app ./app
74-
docker rm -f extract
72+
docker container create --name extract alexellis2/href-counter:build
73+
docker container cp extract:/go/src/github.com/alexellis/href-counter/app ./app
74+
docker container rm -f extract
7575

7676
echo Building alexellis2/href-counter:latest
7777

develop/sdk/examples.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ Reticulating spline 5...
437437

438438
## List all images
439439

440-
List the images on your Engine, similar to `docker images`:
440+
List the images on your Engine, similar to `docker image ls`:
441441

442442
<ul class="nav nav-tabs">
443443
<li class="active"><a data-toggle="tab" data-target="#tab-listimages-go" data-group="go">Go</a></li>

docker-for-mac/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ docker-machine version 0.10.0, build 76ed2a6
8888
8989
The `nginx` webserver continues to run in the container on that port
9090
until you stop and/or remove the container. If you want to stop the
91-
webserver, type: `docker stop webserver` and start it again with `docker
91+
webserver, type: `docker container stop webserver` and start it again with `docker
9292
start webserver`. A stopped container does not show up with `docker ps`; for
9393
that, you need to run `docker ps -a`.
9494
9595
To stop and remove the running container with a single command, type:
96-
`docker rm -f webserver`. This removes the container, but not the
97-
`nginx` image. You can list local images with `docker images`. You might
96+
`docker container rm -f webserver`. This removes the container, but not the
97+
`nginx` image. You can list local images with `docker image ls`. You might
9898
want to keep some images around so that you don't need to pull them again
99-
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`.
99+
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`.
100100
101101
**Want more example applications?** [Get Started](/get-started/) and [Samples](/samples/) are great places to start.
102102

docker-for-windows/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,14 @@ and make sure `docker` commands are working properly.
228228
229229
The `nginx` webserver continues to run in the container on that port
230230
until you stop and/or remove the container. If you want to stop the
231-
webserver, type: `docker stop webserver` and start it again with `docker
231+
webserver, type: `docker container stop webserver` and start it again with `docker
232232
start webserver`.
233233
234234
To stop and remove the running container with a single command, type:
235-
`docker rm -f webserver`. This removes the container, but not the
236-
`nginx` image. You can list local images with `docker images`. You might
235+
`docker container rm -f webserver`. This removes the container, but not the
236+
`nginx` image. You can list local images with `docker image ls`. You might
237237
want to keep some images around so that you don't need to pull them again
238-
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`.
238+
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`.
239239
240240
**Want more example applications?** [Get Started](/get-started/) and [Samples](/samples) are great places to start.
241241

0 commit comments

Comments
 (0)