ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-01-31 08:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1196 from balena-io/allow-multiapp

Browse Source 
Dont error on a target state with multiple apps
This commit is contained in:
CameronDiver 2020-02-10 13:40:15 +07:00 committed by GitHub
commit ca94e7c60e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/application-manager.coffee
View File

@ -862,11 +862,7 @@ module.exports = class ApplicationManager extends EventEmitter
if !localMode
currentAppIds = _.keys(current.local.apps).map((n) -> checkInt(n))
targetAppIds = _.keys(target.local.apps).map((n) -> checkInt(n))
if targetAppIds.length > 1
throw new Error('Current supervisor does not support multiple applications')
diff = _.difference(currentAppIds, targetAppIds)
if diff.length > 0
oldApps = diff
appsForVolumeRemoval = _.difference(currentAppIds, targetAppIds)
nextSteps = []
if !supervisorNetworkReady
@ -899,7 +895,7 @@ module.exports = class ApplicationManager extends EventEmitter
allAppIds = _.union(_.keys(currentByAppId), _.keys(targetByAppId))
for appId in allAppIds
nextSteps = nextSteps.concat(@_nextStepsForAppUpdate(currentByAppId[appId], targetByAppId[appId], localMode, containerIds[appId], availableImages, downloading))
if oldApps != null and _.includes(oldApps, checkInt(appId))
if _.includes(appsForVolumeRemoval, checkInt(appId))
# We check if everything else has been done for
# the old app to be removed. If it has, we then
# remove all of the volumes