Merge pull request arun-gupta#88 from fmmr/master

arun-gupta · arun-gupta · commit cba6dea6e66a · 2015-09-08T10:55:19.000+02:00
clearified stop/remove containers
diff --git a/chapters/docker-container.adoc b/chapters/docker-container.adoc
@@ -310,7 +310,7 @@ docker stop <CONTAINER ID>
 +
 [source, text]
 ----
-docker rm $(docker stop $(docker ps -q))
+docker stop $(docker ps -q)
 ----
 +
 . Stop only the exited containers
@@ -329,14 +329,14 @@ docker ps -a -f "exited=-1"
 docker rm 0bc123a8ece0
 ----
 +
-. Containers meeting a regular expression
+. Remove containers meeting a regular expression
 +
 [source, text]
 ----
 docker ps -a | grep wildfly | awk '{print $1}' | xargs docker rm
 ----
 +
-. All running containers, without any criteria
+. Remove all containers, without any criteria
 +
 [source, text]
 ----

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ docker stop <CONTAINER ID>`
`310`	`310`	`+`
`311`	`311`	`[source, text]`
`312`	`312`	`----`
`313`		`-docker rm $(docker stop $(docker ps -q))`
	`313`	`+docker stop $(docker ps -q)`
`314`	`314`	`----`
`315`	`315`	`+`
`316`	`316`	`. Stop only the exited containers`
`@@ -329,14 +329,14 @@ docker ps -a -f "exited=-1"`
`329`	`329`	`docker rm 0bc123a8ece0`
`330`	`330`	`----`
`331`	`331`	`+`
`332`		`-. Containers meeting a regular expression`
	`332`	`+. Remove containers meeting a regular expression`
`333`	`333`	`+`
`334`	`334`	`[source, text]`
`335`	`335`	`----`
`336`	`336`	`docker ps -a \| grep wildfly \| awk '{print $1}' \| xargs docker rm`
`337`	`337`	`----`
`338`	`338`	`+`
`339`		`-. All running containers, without any criteria`
	`339`	`+. Remove all containers, without any criteria`
`340`	`340`	`+`
`341`	`341`	`[source, text]`
`342`	`342`	`----`