From 3fa0478d32580c9cc65b9fc4fabddc4a8798b7b1 Mon Sep 17 00:00:00 2001 From: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com> Date: Wed, 12 Mar 2025 09:52:10 -0700 Subject: [PATCH] Update common Docker engineering infrastructure with latest --- eng/common/Install-DotNetSdk.ps1 | 4 ++-- eng/common/templates/variables/docker-images.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/Install-DotNetSdk.ps1 b/eng/common/Install-DotNetSdk.ps1 index 1ba23b6c75..945fd31fd0 100644 --- 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 index c73faaeb27..ee8e5d2da0 100644 --- 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