ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2024-12-24 07:46:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #575 via VersionBot

Browse Source 
Fix bug in image management after update
This commit is contained in:
resin-io-versionbot[bot] 2018-03-09 15:33:59 +00:00 committed by GitHub
commit 3b60065f12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 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.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 ## v7.1.5 - 2018-03-09
* Fix bug in require for migrations for legacy preload #574 [Cameron Diver] * Fix bug in require for migrations for legacy preload #574 [Cameron Diver]

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

2
src/application-manager.coffee
View File

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

2
src/migrations/20171129064057_multicontainer.js
View File

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