Bläddra i källkod

Merge pull request #39831 from StefanScherer/fix-dutimgVersion

Fix docker inspect for dutimgVersion
Sebastiaan van Stijn 5 år sedan
förälder
incheckning
c0ef45e90c
1 ändrade filer med 1 tillägg och 1 borttagningar
  1. 1 1
      hack/ci/windows.ps1

+ 1 - 1
hack/ci/windows.ps1

@@ -717,7 +717,7 @@ Try {
     
     
         # Inspect the pulled or loaded image to get the version directly
         # Inspect the pulled or loaded image to get the version directly
         $ErrorActionPreference = "SilentlyContinue"
         $ErrorActionPreference = "SilentlyContinue"
-        $dutimgVersion = $(&"$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" inspect  $($env:WINDOWS_BASE_IMAGE) --format "{{.OsVersion}}")
+        $dutimgVersion = $(&"$env:TEMP\binary\docker-$COMMITHASH" "-H=$($DASHH_CUT)" inspect "$($env:WINDOWS_BASE_IMAGE):$env:WINDOWS_BASE_IMAGE_TAG" --format "{{.OsVersion}}")
         $ErrorActionPreference = "Stop"
         $ErrorActionPreference = "Stop"
         Write-Host -ForegroundColor Green $("INFO: Version of $($env:WINDOWS_BASE_IMAGE):$env:WINDOWS_BASE_IMAGE_TAG is '"+$dutimgVersion+"'")
         Write-Host -ForegroundColor Green $("INFO: Version of $($env:WINDOWS_BASE_IMAGE):$env:WINDOWS_BASE_IMAGE_TAG is '"+$dutimgVersion+"'")
     }
     }