Merge pull request #402 from nanobox-io/hotfix/teardown

make it so the check before teardown is not trusted
nanobox-io · Mar 6, 2017 · 265d52a · 265d52a
2 parents 4ecf739 + 917839b
commit 265d52a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/processors/app/stop.go b/processors/app/stop.go
@@ -75,7 +75,8 @@ func stopDevContainer(appModel *models.App) error {
 	// remove the container
 	if err := docker.ContainerRemove(container.ID); err != nil {
 		lumber.Error("dev:console:teardown:docker.ContainerRemove(%s): %s", container.ID, err)
-		return util.ErrorAppend(err, "failed to remove dev container")
+		// we cannot trust that the container is there even though we checked for it
+		// return util.ErrorAppend(err, "failed to remove dev container")
 	}
 
 	// // extract the container IP

diff --git a/processors/run.go b/processors/run.go
@@ -129,7 +129,8 @@ func teardown(appModel *models.App) error {
 	// remove the container
 	if err := docker.ContainerRemove(container.ID); err != nil {
 		lumber.Error("dev:console:teardown:docker.ContainerRemove(%s): %s", container.ID, err)
-		return util.ErrorAppend(err, "failed to remove dev container")
+		// prechecking for the containers existance does not guarantee it exists
+		// return util.ErrorAppend(err, "failed to remove dev container")
 	}
 
 	return nil