ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-05-04 18:12:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #581 via VersionBot

Browse Source 
When migrating from legacy supervisors, mark the temporary compositio…
This commit is contained in:
resin-io-versionbot[bot] 2018-03-13 21:34:53 +00:00 committed by GitHub
commit 62ad5ce3ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -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! automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/). 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 ## 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] * Avoid trying to send a response to API calls after we've already sent an error #579 [Pablo Carranza Velez]

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "resin-supervisor", "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.", "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", "license": "Apache-2.0",
"repository": { "repository": {
"type": "git", "type": "git",

1
src/application-manager.coffee
View File

@ -267,6 +267,7 @@ module.exports = class ApplicationManager extends EventEmitter
if step.options?.removeImage if step.options?.removeImage
@images.removeByDockerId(step.current.image) @images.removeByDockerId(step.current.image)
updateMetadata: (step, { force = false, skipLock = false } = {}) => 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 }, => @_lockingIfNecessary step.current.appId, { force, skipLock: skipLock or step.options?.skipLock }, =>
@services.updateMetadata(step.current, step.target) @services.updateMetadata(step.current, step.target)
restart: (step, { force = false, skipLock = false } = {}) => restart: (step, { force = false, skipLock = false } = {}) =>

1
src/migrations/20171129064057_multicontainer.js
View File

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