From 2b223f55fadd11614ad02d11deb827ff28c9ab5b Mon Sep 17 00:00:00 2001 From: Pablo Carranza Velez Date: Tue, 23 Jan 2018 09:11:59 -0800 Subject: [PATCH] Fix image comparison when running intermediate targets with depends_on Signed-off-by: Pablo Carranza Velez --- src/application-manager.coffee | 2 +- src/compose/images.coffee | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/application-manager.coffee b/src/application-manager.coffee index f2cb29a5..3f627ee5 100644 --- a/src/application-manager.coffee +++ b/src/application-manager.coffee @@ -597,7 +597,7 @@ module.exports = class ApplicationManager extends EventEmitter if target.dependsOn? for dependency in target.dependsOn 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 true diff --git a/src/compose/images.coffee b/src/compose/images.coffee index b7292917..43513b70 100644 --- a/src/compose/images.coffee +++ b/src/compose/images.coffee @@ -258,8 +258,8 @@ module.exports = class Images extends EventEmitter @imageCleanupFailures[image] = Date.now() @hasSameDigest: (name1, name2) -> - hash1 = name1.split('@')[1] - hash2 = name2.split('@')[1] + hash1 = name1?.split('@')[1] + hash2 = name2?.split('@')[1] return hash1? and hash1 == hash2 @isSameImage: (image1, image2) ->