Auto-merge for PR #581 via VersionBot

When migrating from legacy supervisors, mark the temporary compositio…

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.9 - 2018-03-13
+
+* Skip taking the lock when updating the releaseId or imageId for a service that comes from a legacy supervisor #581 [Pablo Carranza Velez]
+* When migrating from legacy supervisors, mark the temporary composition as legacy #581 [Pablo Carranza Velez]
+
 ## v7.1.8 - 2018-03-13
 
 * Avoid trying to send a response to API calls after we've already sent an error #579 [Pablo Carranza Velez]

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.8",
+  "version": "7.1.9",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

src/application-manager.coffee

@@ -267,6 +267,7 @@ module.exports = class ApplicationManager extends EventEmitter
 						if step.options?.removeImage
 							@images.removeByDockerId(step.current.image)
 			updateMetadata: (step, { force = false, skipLock = false } = {}) =>
+				skipLock or= checkTruthy(step.current.labels['io.resin.legacy-container'])
 				@_lockingIfNecessary step.current.appId, { force, skipLock: skipLock or step.options?.skipLock }, =>
 					@services.updateMetadata(step.current, step.target)
 			restart: (step, { force = false, skipLock = false } = {}) =>

src/migrations/20171129064057_multicontainer.js

@@ -56,6 +56,7 @@ var singleToMulticontainerApp = function (app) {
 				'io.resin.features.resin-api': '1',
 				'io.resin.update.strategy': updateStrategy,
 				'io.resin.update.handover-timeout': handoverTimeout,
+				'io.resin.legacy-container': '1'
 			},
 			environment: environment,
 			restart: restartPolicy,