From 5bc6d3f3bd2bcee1d09ed2d2666afd654505dec7 Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Tue, 12 Apr 2016 02:29:28 -0700 Subject: [PATCH] Fixing the API call of stopping container --- client/driver/docker.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/driver/docker.go b/client/driver/docker.go index fc177933d..3a61768c1 100644 --- a/client/driver/docker.go +++ b/client/driver/docker.go @@ -856,11 +856,15 @@ func (h *DockerHandle) run() { // Stop the container just incase the docker daemon's wait returned // incorrectly if err := h.client.StopContainer(h.containerID, 0); err != nil { - h.logger.Printf("[ERR] driver.docker: error stopping container: %v", err) + _, noSuchContainer := err.(*docker.NoSuchContainer) + _, containerNotRunning := err.(*docker.ContainerNotRunning) + if !containerNotRunning && !noSuchContainer { + h.logger.Printf("[ERR] driver.docker: error stopping container: %v", err) + } } // Remove the container - if err := h.client.RemoveContainer(docker.RemoveContainerOptions{}); err != nil { + if err := h.client.RemoveContainer(docker.RemoveContainerOptions{ID: h.containerID, Force: true}); err != nil { h.logger.Printf("[ERR] driver.docker: error removing container: %v", err) }