VSadov/Satori
1
0
Fork 0
mirror of https://github.com/VSadov/Satori.git synced 2025-06-10 18:11:04 +09:00
Code Activity

Use azl3 images for all current Mariner images (#102775)

Browse source
This commit is contained in:
Jeremy Koritzinsky 2024-05-29 10:27:02 -07:00 • committed by GitHub
parent 3ff4051602
commit 0fe2e9a6c5
Signed by: github
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
eng/pipelines/common/templates/pipeline-with-resources.yml
View file

@ -48,11 +48,11 @@ extends:
# This container contains all required toolsets to build for Android and for Linux with bionic libc. # This container contains all required toolsets to build for Android and for Linux with bionic libc.
linux_bionic: linux_bionic:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-android-amd64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-android-amd64-net9.0
# This container contains all required toolsets to build for Android as well as tooling to build docker images. # This container contains all required toolsets to build for Android as well as tooling to build docker images.
android_docker: android_docker:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-android-docker image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-android-docker-net9.0
linux_x64: linux_x64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-net9.0 image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-net9.0
@ -84,12 +84,12 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
linux_s390x: linux_s390x:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-s390x image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-s390x-net9.0
env: env:
ROOTFS_DIR: /crossrootfs/s390x ROOTFS_DIR: /crossrootfs/s390x
linux_ppc64le: linux_ppc64le:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-ppc64le image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-ppc64le-net9.0
env: env:
ROOTFS_DIR: /crossrootfs/ppc64le ROOTFS_DIR: /crossrootfs/ppc64le
@ -105,17 +105,17 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
browser_wasm: browser_wasm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-webassembly-amd64-net9.0
env: env:
ROOTFS_DIR: /crossrootfs/x64 ROOTFS_DIR: /crossrootfs/x64
wasi_wasm: wasi_wasm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-webassembly-amd64-net9.0
env: env:
ROOTFS_DIR: /crossrootfs/x64 ROOTFS_DIR: /crossrootfs/x64
freebsd_x64: freebsd_x64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-amd64-freebsd-13 image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-freebsd-13-net9.0
env: env:
ROOTFS_DIR: /crossrootfs/x64 ROOTFS_DIR: /crossrootfs/x64
@ -128,4 +128,4 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
rpmpkg: rpmpkg:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-fpm-net9.0