Skip to content

Commit bb860a9

Browse files
authored
Centralize on one container (#60260)
1 parent b1adb84 commit bb860a9

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

.azure/pipelines/ci-public.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ stages:
392392
jobName: Linux_musl_x64_build
393393
jobDisplayName: "Build: Linux Musl x64"
394394
agentOs: Linux
395-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
395+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
396396
buildArgs:
397397
--arch x64
398398
--os-name linux-musl
@@ -426,7 +426,7 @@ stages:
426426
jobDisplayName: "Build: Linux Musl ARM"
427427
agentOs: Linux
428428
useHostedUbuntu: false
429-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
429+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
430430
buildArgs:
431431
--arch arm
432432
--os-name linux-musl
@@ -459,7 +459,7 @@ stages:
459459
jobDisplayName: "Build: Linux Musl ARM64"
460460
agentOs: Linux
461461
useHostedUbuntu: false
462-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
462+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
463463
buildArgs:
464464
--arch arm64
465465
--os-name linux-musl
@@ -629,7 +629,7 @@ stages:
629629
parameters:
630630
platform:
631631
name: 'Managed'
632-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
632+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
633633
buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
634634
skipPublishValidation: true
635635
jobProperties:

.azure/pipelines/ci.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,8 @@ extends:
125125
tsa:
126126
enabled: true
127127
containers:
128-
alpine319WithNode:
129-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
130-
mariner20CrossArmAlpine:
131-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
132-
mariner20CrossArm64Alpine:
133-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
128+
azureLinux30Net10BuildAmd64:
129+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
134130
stages:
135131
- stage: build
136132
displayName: Build
@@ -445,7 +441,7 @@ extends:
445441
jobName: Linux_musl_x64_build
446442
jobDisplayName: "Build: Linux Musl x64"
447443
agentOs: Linux
448-
container: alpine319WithNode
444+
container: azureLinux30Net10BuildAmd64
449445
buildArgs:
450446
--arch x64
451447
--os-name linux-musl
@@ -479,7 +475,7 @@ extends:
479475
jobDisplayName: "Build: Linux Musl ARM"
480476
agentOs: Linux
481477
useHostedUbuntu: false
482-
container: mariner20CrossArmAlpine
478+
container: azureLinux30Net10BuildAmd64
483479
buildArgs:
484480
--arch arm
485481
--os-name linux-musl
@@ -512,7 +508,7 @@ extends:
512508
jobDisplayName: "Build: Linux Musl ARM64"
513509
agentOs: Linux
514510
useHostedUbuntu: false
515-
container: mariner20CrossArm64Alpine
511+
container: azureLinux30Net10BuildAmd64
516512
buildArgs:
517513
--arch arm64
518514
--os-name linux-musl

0 commit comments

Comments
 (0)