ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-05 17:11:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix image comparison when running intermediate targets with depends_on

Browse Source 
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
This commit is contained in:
Pablo Carranza Velez 2018-01-23 09:11:59 -08:00
parent 8956fc1e5a
commit 2b223f55fa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/application-manager.coffee
View File

@ -597,7 +597,7 @@ module.exports = class ApplicationManager extends EventEmitter
if target.dependsOn? if target.dependsOn?
for dependency in target.dependsOn for dependency in target.dependsOn
dependencyService = _.find(targetApp.services, (s) -> s.serviceName == dependency) dependencyService = _.find(targetApp.services, (s) -> s.serviceName == dependency)
if !_.find(availableImages, (image) => @images.isSameImage(image, { name: dependencyService.imageName }))? if !_.find(availableImages, (image) => image.dockerImageId == dependencyService.image or @images.isSameImage(image, { name: dependencyService.imageName }))?
return false return false
return true return true

4
src/compose/images.coffee
View File

@ -258,8 +258,8 @@ module.exports = class Images extends EventEmitter
@imageCleanupFailures[image] = Date.now() @imageCleanupFailures[image] = Date.now()
@hasSameDigest: (name1, name2) -> @hasSameDigest: (name1, name2) ->
hash1 = name1.split('@')[1] hash1 = name1?.split('@')[1]
hash2 = name2.split('@')[1] hash2 = name2?.split('@')[1]
return hash1? and hash1 == hash2 return hash1? and hash1 == hash2
@isSameImage: (image1, image2) -> @isSameImage: (image1, image2) ->