Skip to content

Commit 337d865

Browse files
authored
Switch to Mariner images (#54787)
1 parent 09f5b2c commit 337d865

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ stages:
477477
jobDisplayName: "Build: Linux Musl ARM"
478478
agentOs: Linux
479479
useHostedUbuntu: false
480-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
480+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
481481
buildArgs:
482482
--arch arm
483483
--os-name linux-musl
@@ -510,7 +510,7 @@ stages:
510510
jobDisplayName: "Build: Linux Musl ARM64"
511511
agentOs: Linux
512512
useHostedUbuntu: false
513-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm64-alpine
513+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
514514
buildArgs:
515515
--arch arm64
516516
--os-name linux-musl

.azure/pipelines/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,10 @@ extends:
141141
containers:
142142
alpine319WithNode:
143143
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
144-
ubuntu2204CrossArmAlpine:
145-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
146-
ubuntu2204CrossArm64Alpine:
147-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm64-alpine
144+
mariner20CrossArmAlpine:
145+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
146+
mariner20CrossArm64Alpine:
147+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
148148
stages:
149149
- stage: build
150150
displayName: Build
@@ -540,7 +540,7 @@ extends:
540540
jobDisplayName: "Build: Linux Musl ARM"
541541
agentOs: Linux
542542
useHostedUbuntu: false
543-
container: ubuntu2204CrossArmAlpine
543+
container: mariner20CrossArmAlpine
544544
buildArgs:
545545
--arch arm
546546
--os-name linux-musl
@@ -573,7 +573,7 @@ extends:
573573
jobDisplayName: "Build: Linux Musl ARM64"
574574
agentOs: Linux
575575
useHostedUbuntu: false
576-
container: ubuntu2204CrossArm64Alpine
576+
container: mariner20CrossArm64Alpine
577577
buildArgs:
578578
--arch arm64
579579
--os-name linux-musl

0 commit comments

Comments
 (0)