Merge branch 'refactor/image' into 'master'

it's ok not to remove image while removing container

See merge request !65

Author: timfeirg

VERSION

@@ -1 +1 @@
-0.7.21
+0.7.22

cluster/calcium/helper.go

@@ -140,7 +140,7 @@ func makeMountPaths(specs types.Specs, config types.Config) ([]string, map[strin
 func runExec(client *engineapi.Client, container enginetypes.ContainerJSON, label string) error {
 	cmd, ok := container.Config.Labels[label]
 	if !ok || cmd == "" {
-		log.Debug("No %q found in container %q", label, container.ID)
+		log.Debug("No %s found in container %s", label, container.ID)
 		return nil
 	}
 

cluster/calcium/remove_container.go

@@ -123,15 +123,5 @@ func (c *calcium) removeOneContainer(container *types.Container) error {
 		log.Errorf("Error during ContainerRemove: %s", err.Error())
 		return err
 	}
-
-	// try to remove corresponding image
-	// we don't care if some container is still using the image
-	// docker will care that for us
-	// TODO what if we use another worker to clean all the images?
-	rmiOpts := enginetypes.ImageRemoveOptions{
-		Force:         false,
-		PruneChildren: true,
-	}
-	go container.Engine.ImageRemove(context.Background(), info.Image, rmiOpts)
 	return nil
 }