From 63f1d6640243c7240e92a68d860c6d20960d73d4 Mon Sep 17 00:00:00 2001
From: Pagan Gazzard <pjgazzard@googlemail.com>
Date: Tue, 9 Dec 2014 19:59:30 +0000
Subject: [PATCH] Fix trying to delete supervisor images.

---
 src/docker-utils.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/docker-utils.coffee b/src/docker-utils.coffee
index 8298298d..7c1c55a2 100644
--- a/src/docker-utils.coffee
+++ b/src/docker-utils.coffee
@@ -55,13 +55,13 @@ do ->
 		.finally ->
 			imagesBeingFetched--
 
+	supervisorImages = [ "#{config.localImage}:latest", "#{config.remoteImage}:latest" ]
 	exports.cleanupContainersAndImages = ->
 		knex('app').select()
 		.map (app) ->
 			app.imageId + ':latest'
 		.then (apps) ->
 			# Cleanup containers first, so that they don't block image removal.
-			supervisorImages = [ "#{config.localImage}:latest", "#{config.remoteImage}:latest" ]
 			docker.listContainersAsync(all: true)
 			.filter (containerInfo) ->
 				isUserApp = _.contains(apps, containerInfo.Image)
@@ -80,7 +80,7 @@ do ->
 				docker.listImagesAsync()
 				.filter (image) ->
 					!_.any image.RepoTags, (imageId) ->
-						_.contains(apps, imageId)
+						_.contains(apps, imageId) or _.contains(supervisorImages, imageId)
 				.map (image) ->
 					docker.getImage(image.Id).removeAsync()
 					.then ->