Always purge stopped containers

hashicorp · Aug 31, 2017 · 786c09f · 786c09f
1 parent 473e003
commit 786c09f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -1275,10 +1275,11 @@ CREATE:
 		containerName := "/" + config.Name
 		d.logger.Printf("[DEBUG] driver.docker: searching for container name %q to purge", containerName)
 		for _, shimContainer := range containers {
-			d.logger.Printf("[DEBUG] driver.docker: listed container %+v", container)
+			d.logger.Printf("[DEBUG] driver.docker: listed container %+v", shimContainer.Names)
 			found := false
 			for _, name := range shimContainer.Names {
 				if name == containerName {
+					d.logger.Printf("[DEBUG] driver.docker: Found container %v: %v", containerName, shimContainer.ID)
 					found = true
 					break
 				}
@@ -1300,7 +1301,7 @@ CREATE:
 				// See #2802
 				return nil, structs.NewRecoverableError(err, true)
 			}
-			if container != nil && (container.State.Running || container.State.FinishedAt.IsZero()) {
+			if container != nil && container.State.Running {
 				return container, nil
 			}