Updated the logic of updating ImageName with ImageDigest (#10676)

* Bug fix in logic of updating image digest * removing comments * Added missing mapping * Update Update-DockerImageSettings.psm1 * Addressed review comments * Addressed review comments
microsoft · Jun 25, 2019 · 101173f · 101173f
1 parent d61a6fb
commit 101173f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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
     }
-}
+}
diff --git 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
@@ -20,7 +20,7 @@
   "version": {
     "Major": 2,
     "Minor": 4,
-    "Patch": 4
+    "Patch": 5
   },
   "minimumAgentVersion": "1.95.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",