diff --git a/Tasks/ServiceFabricUpdateManifestsV2/Update-DockerImageSettings.psm1 b/Tasks/ServiceFabricUpdateManifestsV2/Update-DockerImageSettings.psm1 index 8c5594e293bc..db78f881d34e 100644 --- a/Tasks/ServiceFabricUpdateManifestsV2/Update-DockerImageSettings.psm1 +++ b/Tasks/ServiceFabricUpdateManifestsV2/Update-DockerImageSettings.psm1 @@ -43,6 +43,7 @@ function Update-DockerImageSettings { throw (Get-VstsLocString -Key InvalidImageDigestValue -ArgumentList @($imageDigestValue, $imageDigestsPath)) } + $imageDigestRepoNameWithRegistry = $imageDigestValue.Substring(0, $hashSeparatorIndex) $imageDigestRepoName = $imageDigestValue.Substring($slashIndex + 1, $hashSeparatorIndex - $slashIndex - 1) if ($imageNames -ne $null) @@ -67,6 +68,10 @@ function Update-DockerImageSettings { throw (Get-VstsLocString -Key AmbiguousImages -ArgumentList @($imageName)) } + + if($imageDigestRepoNameWithRegistry -ne $imageDigestRepoName ){ + $imageNameToDigestMapping[$imageDigestRepoNameWithRegistry] = $imageDigestValue + } } $imageNameToDigestMapping[$imageName] = $imageDigestValue } @@ -117,4 +122,4 @@ function Update-DockerImageSettings } finally { Trace-VstsLeavingInvocation $MyInvocation } -} \ No newline at end of file +} diff --git a/Tasks/ServiceFabricUpdateManifestsV2/task.json b/Tasks/ServiceFabricUpdateManifestsV2/task.json index b69e108c96b3..d58801325860 100644 --- a/Tasks/ServiceFabricUpdateManifestsV2/task.json +++ b/Tasks/ServiceFabricUpdateManifestsV2/task.json @@ -20,7 +20,7 @@ "version": { "Major": 2, "Minor": 4, - "Patch": 4 + "Patch": 5 }, "minimumAgentVersion": "1.95.0", "instanceNameFormat": "Update Service Fabric Manifests ($(updateType))", diff --git a/Tasks/ServiceFabricUpdateManifestsV2/task.loc.json b/Tasks/ServiceFabricUpdateManifestsV2/task.loc.json index b0fb03466e22..e9d6ca1b7ce5 100644 --- a/Tasks/ServiceFabricUpdateManifestsV2/task.loc.json +++ b/Tasks/ServiceFabricUpdateManifestsV2/task.loc.json @@ -20,7 +20,7 @@ "version": { "Major": 2, "Minor": 4, - "Patch": 4 + "Patch": 5 }, "minimumAgentVersion": "1.95.0", "instanceNameFormat": "ms-resource:loc.instanceNameFormat",