fix an idempotency problem when we left cruft after a faild build

nanobox-io · Jun 1, 2017 · cea82bf · cea82bf
1 parent 7f7e275
commit cea82bf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/processors/code/setup.go b/processors/code/setup.go
@@ -62,6 +62,11 @@ func Setup(appModel *models.App, componentModel *models.Component, warehouseConf
 
 	// create docker container
 	config := container_generator.ComponentConfig(componentModel)
+	// remove any container that may have been created with this name befor
+	// this can happen if the process is killed after the 
+	// container was created but before our db model was saved
+	docker.ContainerRemove(config.Name)
+
 	container, err := docker.CreateContainer(config)
 	if err != nil {
 		lumber.Error("code:Setup:createContainer:docker.CreateContainer(%+v)", config)

diff --git a/processors/component/setup.go b/processors/component/setup.go
@@ -74,6 +74,12 @@ func Setup(appModel *models.App, componentModel *models.Component) error {
 	// start the container
 	display.StartTask("Starting docker container")
 	config := container_generator.ComponentConfig(componentModel)
+
+	// remove any container that may have been created with this name befor
+	// this can happen if the process is killed after the 
+	// container was created but before our db model was saved
+	docker.ContainerRemove(config.Name)
+
 	container, err := docker.CreateContainer(config)
 	if err != nil {
 		lumber.Error("component:Setup:docker.CreateContainer(%+v): %s", config, err.Error())