Make sure all apps are removed before adding new/updating existing, this is to make sure any ports they use have been freed in case they're needed by the new/updated apps.

Conflicts:
	src/application.coffee

src/application.coffee

@@ -151,25 +151,26 @@ exports.update = ->
 				return !_.isEqual(remoteApps[imageId], apps[imageId])
 			console.log(toBeUpdated)
 
-			# Install the apps and add each to the db as they succeed
+			# Delete all the ones to remove in one go
-			promises = toBeInstalled.map (imageId) ->
+			Promise.map toBeRemoved, (imageId) ->
-				app = remoteApps[imageId]
+				kill(apps[imageId])
-				start(app)
 				.then ->
-					knex('app').insert(app)
+					knex('app').where('imageId', imageId).delete()
-			# And restart updated apps and update db as they succeed
-			promises = promises.concat toBeUpdated.map (imageId) ->
-				app = remoteApps[imageId]
-				restart(app)
-				.then ->
-					knex('app').update(app).where(imageId: app.imageId)
-			# And delete all the ones to remove in one go
-			promises.push(
-				Promise.map(toBeRemoved, (imageId) -> kill(apps[imageId]))
-				.then ->
-					knex('app').whereIn('imageId', toBeRemoved).delete()
 			)
-			Promise.all(promises)
+			.then ->
+				# Then install the apps and add each to the db as they succeed
+				installingPromises = toBeInstalled.map (imageId) ->
+					app = remoteApps[imageId]
+					start(app)
+					.then ->
+						knex('app').insert(app)
+				# And restart updated apps and update db as they succeed
+				updatingPromises = toBeUpdated.map (imageId) ->
+					app = remoteApps[imageId]
+					restart(app)
+					.then ->
+						knex('app').update(app).where(imageId: app.imageId)
+				Promise.all(installingPromises.concat(updatingPromises))
 	.finally ->
 		if currentlyUpdating is 2
 			# If an update is required then schedule it