From 8b54731456cf0eb2c0d354b60ae98328d5337788 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 11 Dec 2024 08:17:42 -0600 Subject: [PATCH 1/2] Upgrade latest Alpine to 3.21 for VMR builds --- eng/pipelines/templates/variables/vmr-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index 584fbd97ab86..d95b44d517d1 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -15,9 +15,9 @@ variables: - name: almaLinuxContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build - name: alpineLatestContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode + value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64 - name: alpinePreviousContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode + value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode - name: centOSStreamContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - name: fedoraContainer @@ -50,9 +50,9 @@ variables: - name: almaLinuxName value: AlmaLinux8 - name: alpineLatestName - value: Alpine320 + value: Alpine321 - name: alpinePreviousName - value: Alpine319 + value: Alpine320 - name: centOSStreamName value: CentOSStream9 - name: fedoraName @@ -69,9 +69,9 @@ variables: - name: linuxMuslArm64Rid value: linux-musl-arm64 - name: alpineLatestX64Rid - value: alpine.3.20-x64 + value: alpine.3.21-x64 - name: alpinePreviousX64Rid - value: alpine.3.19-x64 + value: alpine.3.20-x64 - name: centOSStreamX64Rid value: centos.9-x64 - name: fedoraX64Rid From 51f017e837c1c9c49acb31bfbad0a8fc2e918e21 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 12 Dec 2024 08:39:11 -0600 Subject: [PATCH 2/2] Update other references to image names --- src/SourceBuild/content/eng/pipelines/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index db2364ebf02c..9d37796b3ff7 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -82,10 +82,10 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build options: --privileged alpineLatestContainer: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64 options: --privileged alpinePreviousContainer: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode options: --privileged centOSStreamContainer: image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9