[main] Update common Docker engineering infrastructure with latest (#6314)

dotnet-docker-bot · web-flow · commit 8bf45708a518 · 2025-03-17T07:52:29.000-07:00
diff --git a/eng/common/Install-DotNetSdk.ps1 b/eng/common/Install-DotNetSdk.ps1
@@ -45,11 +45,11 @@ $DotnetChannel = "9.0"
 $InstallFailed = $false
 if ($IsRunningOnUnix) {
     & chmod +x $DotnetInstallScriptPath
-    & $DotnetInstallScriptPath --channel $DotnetChannel --install-dir $InstallPath
+    & "$PSScriptRoot/Invoke-WithRetry.ps1" "$DotnetInstallScriptPath --channel $DotnetChannel --install-dir $InstallPath" -Retries 5
     $InstallFailed = ($LASTEXITCODE -ne 0)
 }
 else {
-    & $DotnetInstallScriptPath -Channel $DotnetChannel -InstallDir $InstallPath
+    & "$PSScriptRoot/Invoke-WithRetry.ps1" "$DotnetInstallScriptPath -Channel $DotnetChannel -InstallDir $InstallPath" -Retries 5
     $InstallFailed = (-not $?)
 }
 
diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2657098
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2660728
   imageNames.imageBuilder: $(imageNames.imageBuilderName)
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
   imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,11 @@ $DotnetChannel = "9.0"`
`45`	`45`	`$InstallFailed = $false`
`46`	`46`	`if ($IsRunningOnUnix) {`
`47`	`47`	`& chmod +x $DotnetInstallScriptPath`
`48`		`- & $DotnetInstallScriptPath --channel $DotnetChannel --install-dir $InstallPath`
	`48`	`+ & "$PSScriptRoot/Invoke-WithRetry.ps1" "$DotnetInstallScriptPath --channel $DotnetChannel --install-dir $InstallPath" -Retries 5`
`49`	`49`	`$InstallFailed = ($LASTEXITCODE -ne 0)`
`50`	`50`	`}`
`51`	`51`	`else {`
`52`		`- & $DotnetInstallScriptPath -Channel $DotnetChannel -InstallDir $InstallPath`
	`52`	`+ & "$PSScriptRoot/Invoke-WithRetry.ps1" "$DotnetInstallScriptPath -Channel $DotnetChannel -InstallDir $InstallPath" -Retries 5`
`53`	`53`	`$InstallFailed = (-not $?)`
`54`	`54`	`}`
`55`	`55`