Skip to content

Commit 5e00c29

Browse files
committed
Update our container images to newer ones that are in support similar to https://github.com/dotnet/installer/pull/20512/files.
Update alpine 3.19 to 3.22 Update clb-mariner 2.0 to azurelinux 3.0 Update fedora 39 to fedora 41
1 parent c89e2c9 commit 5e00c29

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.vsts-ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ extends:
6060
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
6161
parameters:
6262
containers:
63-
alpine319WithNode:
64-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
65-
cblMariner20Fpm:
66-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
63+
alpine322:
64+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
65+
azureLinux30:
66+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64
6767
centosStream9:
6868
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
6969
debian12Amd64:
7070
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
71-
fedora39:
72-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
73-
mariner20CrossArm:
74-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
71+
fedora41:
72+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
73+
azureLinux30CrossArm:
74+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-arm-alpine
7575
ubuntu2204DebPkg:
7676
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
7777
sdl:
@@ -204,14 +204,14 @@ extends:
204204
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
205205
runTests: false
206206
- categoryName: Portable
207-
container: cblMariner20Fpm
207+
container: azureLinux30
208208
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
209209
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
210210
officialBuildProperties: $(_officialBuildProperties)
211211
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
212212
runTests: false
213213
- categoryName: Portable
214-
container: cblMariner20Fpm
214+
container: azureLinux30
215215
buildArchitecture: arm64
216216
runtimeIdentifier: linux-arm64
217217
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
@@ -221,7 +221,7 @@ extends:
221221
runTests: false
222222
### MUSL ###
223223
- categoryName: Musl
224-
container: alpine319WithNode
224+
container: alpine322
225225
runtimeIdentifier: linux-musl-x64
226226
publishArgument: $(_publishArgument)
227227
officialBuildProperties: $(_officialBuildProperties)
@@ -231,7 +231,7 @@ extends:
231231
enableSbom: false
232232
runTests: false
233233
- categoryName: Musl
234-
container: mariner20CrossArm
234+
container: azureLinux30CrossArm
235235
buildArchitecture: arm
236236
runtimeIdentifier: linux-musl-arm
237237
publishArgument: $(_publishArgument)

.vsts-pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ variables:
1616

1717
resources:
1818
containers:
19-
- container: alpine319WithNode
20-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
19+
- container: alpine322
20+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
2121
- container: centosStream9
2222
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
2323
- container: debian12Amd64
2424
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
25-
- container: fedora39
26-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
25+
- container: fedora41
26+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
2727
- container: ubuntu2204DebPkg
2828
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
2929

eng/pipelines/templates/jobs/sdk-job-matrix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ parameters:
3535
# See: https://github.com/dotnet/sdk/issues/40935
3636
runTests: false
3737
- categoryName: ContainerBased
38-
container: fedora39
38+
container: fedora41
3939
# No fedora Helix container is available, so use the ubuntu one instead.
4040
helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-22.04-helix-amd64
4141
osProperties: $(linuxOsPortableProperties)
@@ -57,7 +57,7 @@ parameters:
5757
# See: https://github.com/dotnet/sdk/issues/40935
5858
runTests: false
5959
- categoryName: ContainerBased
60-
container: alpine319WithNode
60+
container: alpine322
6161
helixTargetContainer: $(helixTargetContainerPrefix)alpine-3.18-helix-amd64
6262
runtimeIdentifier: linux-musl-x64
6363
# Use HostOSName when running on alpine.

0 commit comments

Comments
 (0)