default to deleting images via the remote api

unclejack · unclejack · commit b60d6471721b · 2014-05-19T23:10:54.000+03:00
This makes the remote API version 1.12 and newer default to
automatically deleting intermediate containers when the build has
succeedeed.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu &lt;cristian.staretu@gmail.com&gt; (github: unclejack)
diff --git a/api/client/commands.go b/api/client/commands.go
@@ -198,6 +198,8 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
 	}
 	if *rm {
 		v.Set("rm", "1")
+	} else {
+		v.Set("rm", "0")
 	}
 
 	if *forceRm {
diff --git a/api/server/server.go b/api/server/server.go
@@ -903,8 +903,11 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite
 	} else {
 		job.Stdout.Add(utils.NewWriteFlusher(w))
 	}
+
 	if r.FormValue("forcerm") == "1" && version.GreaterThanOrEqualTo("1.12") {
 		job.Setenv("rm", "1")
+	} else if r.FormValue("rm") == "" && version.GreaterThanOrEqualTo("1.12") {
+		job.Setenv("rm", "1")
 	} else {
 		job.Setenv("rm", r.FormValue("rm"))
 	}
diff --git a/docs/sources/reference/api/docker_remote_api_v1.12.md b/docs/sources/reference/api/docker_remote_api_v1.12.md
@@ -1063,7 +1063,7 @@ Build an image from Dockerfile via stdin
         the resulting image in case of success
     -   **q** – suppress verbose build output
     -   **nocache** – do not use the cache when building the image
-    -   **rm** - remove intermediate containers after a successful build
+    -   **rm** - remove intermediate containers after a successful build (default behavior)
     -   **forcerm - always remove intermediate containers (includes rm)
 
     Request Headers:

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,8 @@ func (cli *DockerCli) CmdBuild(args ...string) error {`
`198`	`198`	`}`
`199`	`199`	`if *rm {`
`200`	`200`	`v.Set("rm", "1")`
	`201`	`+ } else {`
	`202`	`+ v.Set("rm", "0")`
`201`	`203`	`}`
`202`	`204`
`203`	`205`	`if *forceRm {`
Original file line number	Diff line number	Diff line change
`@@ -903,8 +903,11 @@ func postBuild(eng *engine.Engine, version version.Version, w http.ResponseWrite`
`903`	`903`	`} else {`
`904`	`904`	`job.Stdout.Add(utils.NewWriteFlusher(w))`
`905`	`905`	`}`
	`906`	`+`
`906`	`907`	`if r.FormValue("forcerm") == "1" && version.GreaterThanOrEqualTo("1.12") {`
`907`	`908`	`job.Setenv("rm", "1")`
	`909`	`+ } else if r.FormValue("rm") == "" && version.GreaterThanOrEqualTo("1.12") {`
	`910`	`+ job.Setenv("rm", "1")`
`908`	`911`	`} else {`
`909`	`912`	`job.Setenv("rm", r.FormValue("rm"))`
`910`	`913`	`}`