Refactor container cleanup to remove all spurious containers

We change the way container cleanup works so that it compares running
app containers with the container names for the known apps. This allows
the cleanup to effectively delete any spurious/duplicated app containers.

Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>

src/docker-utils.coffee

@@ -138,34 +138,33 @@ do ->
 		Promise.using writeLockImages(), ->
 			Promise.join(
 				knex('app').select()
-				.map ({ imageId }) ->
+				.map (app) ->
-					normalizeRepoTag(imageId)
+					app.imageId = normalizeRepoTag(app.imageId)
+					return Promise.props(app)
 				knex('dependentApp').select().whereNotNull('imageId')
 				.map ({ imageId }) ->
-					normalizeRepoTag(imageId)
+					return normalizeRepoTag(imageId)
 				supervisorTagPromise
 				docker.listImages()
 				.map (image) ->
 					image.NormalizedRepoTags = Promise.map(image.RepoTags, normalizeRepoTag)
-					Promise.props(image)
+					return Promise.props(image)
 				Promise.map(extraImagesToIgnore, normalizeRepoTag)
 				(apps, dependentApps, supervisorTag, images, normalizedExtraImages) ->
+					appNames = _.map(apps, 'containerName')
+					appImages = _.map(apps, 'imageId')
 					imageTags = _.map(images, 'NormalizedRepoTags')
-					supervisorTags = _.filter imageTags, (tags) ->
-						_.includes(tags, supervisorTag)
 					appTags = _.filter imageTags, (tags) ->
 						_.some tags, (tag) ->
-							_.includes(apps, tag) or _.includes(dependentApps, tag)
+							_.includes(appImages, tag) or _.includes(dependentApps, tag)
-					extraTags = _.filter imageTags, (tags) ->
-						_.some tags, (tag) ->
-							_.includes(normalizedExtraImages, tag)
-					supervisorTags = _.flatten(supervisorTags)
 					appTags = _.flatten(appTags)
+					supervisorTags = _.filter imageTags, (tags) ->
+						_.includes(tags, supervisorTag)
+					supervisorTags = _.flatten(supervisorTags)
+					extraTags = _.filter imageTags, (tags) ->
+						_.some(tags, (tag) -> _.includes(normalizedExtraImages, tag))
 					extraTags = _.flatten(extraTags)
-
+					allProtectedTags = _.union(appTags, supervisorTags, extraTags)
-					return { images, supervisorTags, appTags, extraTags }
-			)
-			.then ({ images, supervisorTags, appTags, extraTags }) ->
 					# Cleanup containers first, so that they don't block image removal.
 					docker.listContainers(all: true)
 					.filter (containerInfo) ->
@@ -173,12 +172,11 @@ do ->
 						normalizeRepoTag(containerInfo.Image)
 						.then (repoTag) ->
 							if _.includes(appTags, repoTag)
-							return false
+								return !_.some containerInfo.Names, (name) ->
-						if _.includes(extraTags, repoTag)
+									_.some appNames, (appContainerName) -> "/#{appContainerName}" == name
-							return false
+							if _.includes(supervisorTags, repoTag)
-						if !_.includes(supervisorTags, repoTag)
-							return true
 								return containerHasExited(containerInfo.Id)
+							return true
 					.map (containerInfo) ->
 						docker.getContainer(containerInfo.Id).remove(v: true, force: true)
 						.then ->
@@ -186,14 +184,14 @@ do ->
 						.catch(_.noop)
 					.then ->
 						imagesToClean = _.reject images, (image) ->
-						_.some image.NormalizedRepoTags, (tag) ->
+							_.some(image.NormalizedRepoTags, (tag) -> _.includes(allProtectedTags, tag))
-							return _.includes(appTags, tag) or _.includes(supervisorTags, tag) or _.includes(extraTags, tag)
 						Promise.map imagesToClean, (image) ->
 							Promise.map image.RepoTags.concat(image.Id), (tag) ->
 								docker.getImage(tag).remove(force: true)
 								.then ->
 									console.log('Deleted image:', tag, image.Id, image.RepoTags)
 								.catch(_.noop)
+			)
 
 	containerHasExited = (id) ->
 		docker.getContainer(id).inspect()