Auto-merge for PR #575 via VersionBot

Fix bug in image management after update

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v7.1.6 - 2018-03-09
+
+* Migrations: Use the correct service name for legacy apps #575 [Pablo Carranza Velez]
+* ApplicationManager: only use dockerImageId to identify images for current apps, to avoid trying to delete an image that is in use #575 [Pablo Carranza Velez]
+
 ## v7.1.5 - 2018-03-09
 
 * Fix bug in require for migrations for legacy preload #574 [Cameron Diver]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "resin-supervisor",
   "description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
-  "version": "7.1.5",
+  "version": "7.1.6",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

src/application-manager.coffee

@@ -892,7 +892,7 @@ module.exports = class ApplicationManager extends EventEmitter
 		allImagesForTargetApp = (app) -> _.map(app.services, imageForService)
 		allImagesForCurrentApp = (app) ->
 			_.map app.services, (service) ->
-				_.omit(_.find(available, { dockerImageId: service.image, imageId: service.imageId }), [ 'dockerImageId', 'id' ])
+				_.omit(_.find(available, { dockerImageId: service.image }), [ 'dockerImageId', 'id' ])
 		availableWithoutIds = _.map(available, (image) -> _.omit(image, [ 'dockerImageId', 'id' ]))
 		currentImages = _.flatMap(current.local.apps, allImagesForCurrentApp)
 		targetImages = _.flatMap(target.local.apps, allImagesForTargetApp)

src/migrations/20171129064057_multicontainer.js

@@ -38,7 +38,7 @@ var singleToMulticontainerApp = function (app) {
 		{
 			serviceId: 1,
 			appId: appId,
-			serviceName: app.name.toLowerCase(),
+			serviceName: 'main',
 			imageId: 1,
 			commit: app.commit,
 			releaseId: 1,