From 74a4f27a162676d9217a79ea0f2dcb686b97507d Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 4 Sep 2014 17:03:24 -0700
Subject: [PATCH] buidler/docker: remove container [GH-1206] [GH-1095]

---
 CHANGELOG.md                    | 1 +
 builder/docker/driver_docker.go | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08d1140e6..a42e46104 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ BUG FIXES:
   * builder/amazon/all: `delete_on_termination` set to false will work.
   * builder/amazon/all: More desctriptive error messages if Amazon only
       sends an error code. [GH-1189]
+  * builder/docker: Remove the container during cleanup. [GH-1206]
   * builder/googlecompute: add `disk_size` option. [GH-1397]
   * builder/openstack: Region is not required. [GH-1418]
   * builder/parallels-iso: ISO not removed from VM after install [GH-1338]
diff --git a/builder/docker/driver_docker.go b/builder/docker/driver_docker.go
index 5c43e0078..7d7ed4af8 100644
--- a/builder/docker/driver_docker.go
+++ b/builder/docker/driver_docker.go
@@ -149,7 +149,11 @@ func (d *DockerDriver) StartContainer(config *ContainerConfig) (string, error) {
 }
 
 func (d *DockerDriver) StopContainer(id string) error {
-	return exec.Command("docker", "kill", id).Run()
+	if err := exec.Command("docker", "kill", id).Run(); err != nil {
+		return err
+	}
+
+	return exec.Command("docker", "rm", id).Run()
 }
 
 func (d *DockerDriver) Verify() error {