From 6ba9405574eb049960f22ecc63962602097a09a5 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 9 Aug 2024 11:30:37 -0700 Subject: [PATCH 1/2] Add Azure Linux 3.0 images for .NET 8 --- README.aspnet.md | 10 + README.runtime-deps.md | 6 + README.runtime.md | 6 + README.sdk.md | 2 + .../aspnet-tags.yml | 10 + .../runtime-deps-tags.yml | 6 + .../runtime-tags.yml | 6 + eng/mcr-tags-metadata-templates/sdk-tags.yml | 2 + manifest.json | 591 ++++++++++++++++++ .../amd64/Dockerfile | 38 ++ .../arm64v8/Dockerfile | 38 ++ .../amd64/Dockerfile | 38 ++ .../arm64v8/Dockerfile | 38 ++ .../amd64/Dockerfile | 28 + .../arm64v8/Dockerfile | 28 + .../azurelinux3.0-distroless/amd64/Dockerfile | 28 + .../arm64v8/Dockerfile | 28 + src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile | 25 + .../8.0/azurelinux3.0/arm64v8/Dockerfile | 25 + .../amd64/Dockerfile | 73 +++ .../arm64v8/Dockerfile | 73 +++ .../azurelinux3.0-distroless/amd64/Dockerfile | 73 +++ .../arm64v8/Dockerfile | 73 +++ .../8.0/azurelinux3.0/amd64/Dockerfile | 37 ++ .../8.0/azurelinux3.0/arm64v8/Dockerfile | 37 ++ .../amd64/Dockerfile | 35 ++ .../arm64v8/Dockerfile | 35 ++ .../azurelinux3.0-distroless/amd64/Dockerfile | 35 ++ .../arm64v8/Dockerfile | 35 ++ .../8.0/azurelinux3.0/amd64/Dockerfile | 28 + .../8.0/azurelinux3.0/arm64v8/Dockerfile | 28 + src/sdk/8.0/azurelinux3.0/amd64/Dockerfile | 6 +- src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile | 6 +- 33 files changed, 1521 insertions(+), 6 deletions(-) create mode 100644 src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile create mode 100644 src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile create mode 100644 src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile create mode 100644 src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile create mode 100644 src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile create mode 100644 src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile create mode 100644 src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile create mode 100644 src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile create mode 100644 src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile create mode 100644 src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile create mode 100644 src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile create mode 100644 src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile create mode 100644 src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile create mode 100644 src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile create mode 100644 src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile create mode 100644 src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile create mode 100644 src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile create mode 100644 src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile create mode 100644 src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile create mode 100644 src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile create mode 100644 src/runtime/8.0/azurelinux3.0/amd64/Dockerfile create mode 100644 src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile diff --git a/README.aspnet.md b/README.aspnet.md index fa5709a4cc..9646049cd4 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -86,6 +86,11 @@ Tags | Dockerfile | OS Version 8.0.8-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.8-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-composite-amd64, 8.0-jammy-chiseled-composite-amd64, 8.0.8-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/jammy-chiseled-composite/amd64/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-composite-extra-amd64, 8.0-jammy-chiseled-composite-extra-amd64, 8.0.8-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/jammy-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 22.04 +8.0.8-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.8-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.8-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.8-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-composite-amd64, 8.0-azurelinux3.0-distroless-composite-amd64, 8.0.8-azurelinux3.0-distroless-composite, 8.0-azurelinux3.0-distroless-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-composite-extra-amd64, 8.0-azurelinux3.0-distroless-composite-extra-amd64, 8.0.8-azurelinux3.0-distroless-composite-extra, 8.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0 8.0.8-cbl-mariner2.0-amd64, 8.0-cbl-mariner2.0-amd64, 8.0.8-cbl-mariner2.0, 8.0-cbl-mariner2.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0/amd64/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-amd64, 8.0-cbl-mariner2.0-distroless-amd64, 8.0.8-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-extra-amd64, 8.0-cbl-mariner2.0-distroless-extra-amd64, 8.0.8-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile) | CBL-Mariner 2.0 @@ -137,6 +142,11 @@ Tags | Dockerfile | OS Version 8.0.8-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.8-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-composite-arm64v8, 8.0-jammy-chiseled-composite-arm64v8, 8.0.8-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/jammy-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-composite-extra-arm64v8, 8.0-jammy-chiseled-composite-extra-arm64v8, 8.0.8-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 22.04 +8.0.8-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.8-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.8-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.8-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-composite-arm64v8, 8.0-azurelinux3.0-distroless-composite-arm64v8, 8.0.8-azurelinux3.0-distroless-composite, 8.0-azurelinux3.0-distroless-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-composite-extra-arm64v8, 8.0-azurelinux3.0-distroless-composite-extra-arm64v8, 8.0.8-azurelinux3.0-distroless-composite-extra, 8.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.8-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner2.0-arm64v8, 8.0.8-cbl-mariner2.0, 8.0-cbl-mariner2.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0/arm64v8/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-arm64v8, 8.0-cbl-mariner2.0-distroless-arm64v8, 8.0.8-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-extra-arm64v8, 8.0-cbl-mariner2.0-distroless-extra-arm64v8, 8.0.8-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile) | CBL-Mariner 2.0 diff --git a/README.runtime-deps.md b/README.runtime-deps.md index b1e8e622d9..3bc2d30b3f 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -63,6 +63,9 @@ Tags | Dockerfile | OS Version 8.0.8-jammy-amd64, 8.0-jammy-amd64, 8.0.8-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.8-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.8-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04 +8.0.8-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.8-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.8-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.8-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 8.0.8-cbl-mariner2.0-amd64, 8.0-cbl-mariner2.0-amd64, 8.0.8-cbl-mariner2.0, 8.0-cbl-mariner2.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/cbl-mariner2.0/amd64/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-amd64, 8.0-cbl-mariner2.0-distroless-amd64, 8.0.8-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-extra-amd64, 8.0-cbl-mariner2.0-distroless-extra-amd64, 8.0.8-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile) | CBL-Mariner 2.0 @@ -104,6 +107,9 @@ Tags | Dockerfile | OS Version 8.0.8-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.8-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.8-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.8-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04 +8.0.8-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.8-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.8-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.8-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.8-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner2.0-arm64v8, 8.0.8-cbl-mariner2.0, 8.0-cbl-mariner2.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/cbl-mariner2.0/arm64v8/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-arm64v8, 8.0-cbl-mariner2.0-distroless-arm64v8, 8.0.8-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-extra-arm64v8, 8.0-cbl-mariner2.0-distroless-extra-arm64v8, 8.0.8-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime-deps/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile) | CBL-Mariner 2.0 diff --git a/README.runtime.md b/README.runtime.md index 4e5ff8f3a7..4fec93a728 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -69,6 +69,9 @@ Tags | Dockerfile | OS Version 8.0.8-jammy-amd64, 8.0-jammy-amd64, 8.0.8-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.8-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.8-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04 +8.0.8-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.8-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-amd64, 8.0-azurelinux3.0-distroless-amd64, 8.0.8-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-extra-amd64, 8.0-azurelinux3.0-distroless-extra-amd64, 8.0.8-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 8.0.8-cbl-mariner2.0-amd64, 8.0-cbl-mariner2.0-amd64, 8.0.8-cbl-mariner2.0, 8.0-cbl-mariner2.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0/amd64/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-amd64, 8.0-cbl-mariner2.0-distroless-amd64, 8.0.8-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-extra-amd64, 8.0-cbl-mariner2.0-distroless-extra-amd64, 8.0.8-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile) | CBL-Mariner 2.0 @@ -107,6 +110,9 @@ Tags | Dockerfile | OS Version 8.0.8-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.8-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.8-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.8-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.8-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04 +8.0.8-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.8-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-arm64v8, 8.0-azurelinux3.0-distroless-arm64v8, 8.0.8-azurelinux3.0-distroless, 8.0-azurelinux3.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +8.0.8-azurelinux3.0-distroless-extra-arm64v8, 8.0-azurelinux3.0-distroless-extra-arm64v8, 8.0.8-azurelinux3.0-distroless-extra, 8.0-azurelinux3.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.8-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner2.0-arm64v8, 8.0.8-cbl-mariner2.0, 8.0-cbl-mariner2.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0/arm64v8/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-arm64v8, 8.0-cbl-mariner2.0-distroless-arm64v8, 8.0.8-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 8.0.8-cbl-mariner2.0-distroless-extra-arm64v8, 8.0-cbl-mariner2.0-distroless-extra-arm64v8, 8.0.8-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile) | CBL-Mariner 2.0 diff --git a/README.sdk.md b/README.sdk.md index 2d4966c9b4..5125170d58 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -67,6 +67,7 @@ Tags | Dockerfile | OS Version 8.0.400-alpine3.19-amd64, 8.0-alpine3.19-amd64, 8.0.400-alpine3.19, 8.0-alpine3.19 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/alpine3.19/amd64/Dockerfile) | Alpine 3.19 8.0.400-noble-amd64, 8.0-noble-amd64, 8.0.400-noble, 8.0-noble | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04 8.0.400-jammy-amd64, 8.0-jammy-amd64, 8.0.400-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04 +8.0.400-azurelinux3.0-amd64, 8.0-azurelinux3.0-amd64, 8.0.400-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 8.0.400-cbl-mariner2.0-amd64, 8.0-cbl-mariner2.0-amd64, 8.0.400-cbl-mariner2.0, 8.0-cbl-mariner2.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/cbl-mariner2.0/amd64/Dockerfile) | CBL-Mariner 2.0 6.0.425-bookworm-slim-amd64, 6.0-bookworm-slim-amd64, 6.0.425-bookworm-slim, 6.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bookworm-slim/amd64/Dockerfile) | Debian 12 6.0.425-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.425-bullseye-slim, 6.0-bullseye-slim, 6.0.425, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 @@ -92,6 +93,7 @@ Tags | Dockerfile | OS Version 8.0.400-alpine3.19-arm64v8, 8.0-alpine3.19-arm64v8, 8.0.400-alpine3.19, 8.0-alpine3.19 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/alpine3.19/arm64v8/Dockerfile) | Alpine 3.19 8.0.400-noble-arm64v8, 8.0-noble-arm64v8, 8.0.400-noble, 8.0-noble | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 8.0.400-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.400-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04 +8.0.400-azurelinux3.0-arm64v8, 8.0-azurelinux3.0-arm64v8, 8.0.400-azurelinux3.0, 8.0-azurelinux3.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.400-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner2.0-arm64v8, 8.0.400-cbl-mariner2.0, 8.0-cbl-mariner2.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/cbl-mariner2.0/arm64v8/Dockerfile) | CBL-Mariner 2.0 6.0.425-bookworm-slim-arm64v8, 6.0-bookworm-slim-arm64v8, 6.0.425-bookworm-slim, 6.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 6.0.425-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.425-bullseye-slim, 6.0-bullseye-slim, 6.0.425, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml index 59d9039d2b..496b311dee 100644 --- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml @@ -40,6 +40,11 @@ $(McrTagsYmlTagGroup:8.0-jammy-chiseled-amd64) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-amd64) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-amd64) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite-extra-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-amd64) @@ -96,6 +101,11 @@ $(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite-extra-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-arm64v8) diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml index f2e3802c7d..6bed6de060 100644 --- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml @@ -28,6 +28,9 @@ $(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-amd64) $(McrTagsYmlTagGroup:8.0-jammy-amd64) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-amd64) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-amd64) @@ -70,6 +73,9 @@ $(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-arm64v8) diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml index fe1c91aa71..f918d9e033 100644 --- a/eng/mcr-tags-metadata-templates/runtime-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml @@ -24,6 +24,9 @@ $(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-amd64) $(McrTagsYmlTagGroup:8.0-jammy-amd64) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-amd64) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-amd64) @@ -62,6 +65,9 @@ $(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-arm64v8) diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml index ef2097d529..6613dec79a 100644 --- a/eng/mcr-tags-metadata-templates/sdk-tags.yml +++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml @@ -12,6 +12,7 @@ $(McrTagsYmlTagGroup:8.0-alpine3.20-amd64) $(McrTagsYmlTagGroup:8.0-alpine3.19-amd64) $(McrTagsYmlTagGroup:8.0-noble-amd64) $(McrTagsYmlTagGroup:8.0-jammy-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) $(McrTagsYmlTagGroup:6.0-bookworm-slim-amd64) $(McrTagsYmlTagGroup:6.0-bullseye-slim-amd64) @@ -33,6 +34,7 @@ $(McrTagsYmlTagGroup:8.0-alpine3.20-arm64v8) $(McrTagsYmlTagGroup:8.0-alpine3.19-arm64v8) $(McrTagsYmlTagGroup:8.0-noble-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) $(McrTagsYmlTagGroup:6.0-bookworm-slim-arm64v8) $(McrTagsYmlTagGroup:6.0-bullseye-slim-arm64v8) diff --git a/manifest.json b/manifest.json index 368de6dcf3..031cc1531a 100644 --- a/manifest.json +++ b/manifest.json @@ -1297,6 +1297,149 @@ } ] }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0": {} + }, + "platforms": [ + { + "dockerfile": "src/runtime-deps/8.0/azurelinux3.0/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile", + "os": "linux", + "osVersion": "azurelinux3.0", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-amd64": {} + } + }, + { + "architecture": "arm64", + "dockerfile": "src/runtime-deps/8.0/azurelinux3.0/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile", + "os": "linux", + "osVersion": "azurelinux3.0", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-arm64v8": {} + }, + "variant": "v8" + } + ] + }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless": {} + }, + "platforms": [ + { + "dockerfile": "src/runtime-deps/8.0/azurelinux3.0-distroless/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64" + ] + }, + { + "name": "test-dependencies", + "type": "Integral", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "dockerfile": "src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8" + ] + }, + { + "name": "test-dependencies", + "type": "Integral", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8" + ] + } + ] + } + ] + }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra": {} + }, + "platforms": [ + { + "dockerfile": "src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner.extra", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "test-dependencies", + "type": "Integral", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "dockerfile": "src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner.extra", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "test-dependencies", + "type": "Integral", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8" + ] + } + ] + } + ] + }, { "productVersion": "$(dotnet|9.0|product-version)", "sharedTags": { @@ -3229,6 +3372,153 @@ } ] }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/azurelinux3.0/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-amd64": {} + } + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/azurelinux3.0/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-arm64v8": {} + }, + "variant": "v8" + } + ] + }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8" + ] + } + ] + } + ] + }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless-extra/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8" + ] + } + ] + } + ] + }, { "productVersion": "$(dotnet|8.0|product-version)", "platforms": [ @@ -3821,6 +4111,13 @@ "dependencies": [ "$(Repo:sdk):$(sdk|9.0|minor-tag)-azurelinux3.0-arm64v8" ] + }, + { + "name": "test-dependencies", + "type": "Integral", + "dependencies": [ + "$(Repo:runtime):$(dotnet|9.0|minor-tag)-azurelinux3.0-arm64v8" + ] } ] } @@ -5752,6 +6049,263 @@ } ] }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-amd64": {} + } + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-arm64v8": {} + }, + "variant": "v8" + } + ] + }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8" + ] + } + ] + } + ] + }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-extra-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-extra-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8" + ] + } + ] + } + ] + }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8" + ] + } + ] + } + ] + }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-extra": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-extra": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-amd64": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-extra-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra", + "os": "linux", + "osVersion": "azurelinux3.0-distroless", + "tags": { + "$(dotnet|8.0|fixed-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-azurelinux3.0-distroless-composite-extra-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8" + ] + } + ] + } + ] + }, { "productVersion": "$(dotnet|8.0|product-version)", "platforms": [ @@ -7539,6 +8093,43 @@ } ] }, + { + "productVersion": "$(sdk|8.0|product-version)", + "sharedTags": { + "$(sdk|8.0|fixed-tag)-azurelinux3.0": {}, + "$(sdk|8.0|minor-tag)-azurelinux3.0": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:aspnet)" + }, + "dockerfile": "src/sdk/8.0/azurelinux3.0/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0", + "tags": { + "$(sdk|8.0|fixed-tag)-azurelinux3.0-amd64": {}, + "$(sdk|8.0|minor-tag)-azurelinux3.0-amd64": {} + } + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:aspnet)" + }, + "dockerfile": "src/sdk/8.0/azurelinux3.0/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux", + "os": "linux", + "osVersion": "azurelinux3.0", + "tags": { + "$(sdk|8.0|fixed-tag)-azurelinux3.0-arm64v8": {}, + "$(sdk|8.0|minor-tag)-azurelinux3.0-arm64v8": {} + }, + "variant": "v8" + } + ] + }, { "productVersion": "$(sdk|8.0|product-version)", "platforms": [ diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile new file mode 100644 index 0000000000..a1a75acc2c --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile @@ -0,0 +1,38 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Composite Runtime +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + && dotnet_sha512='7f5c9df8a36f900021cdd6c3e8aa7e1583b1dd413de52d0ee109f44f101479110828f8840082020b86e06301789f075a6ce0018b86af26bf9544fe4f6fc165f2' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# ASP.NET Composite Image +FROM $REPO:8.0.8-azurelinux3.0-distroless-extra-amd64 + +ENV \ + # .NET Runtime version + DOTNET_VERSION=8.0.8 \ + # ASP.NET Core version + ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile new file mode 100644 index 0000000000..98ea05c130 --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile @@ -0,0 +1,38 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Composite Runtime +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + && dotnet_sha512='6385460af9f0e0377fa92f737dd0c76aaac60c8602c0a872467909738ab95dca67d9f75e10077610a3a7ea52f4abef5a86f50f25eee1c8587426011441d1abfc' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# ASP.NET Composite Image +FROM $REPO:8.0.8-azurelinux3.0-distroless-extra-arm64v8 + +ENV \ + # .NET Runtime version + DOTNET_VERSION=8.0.8 \ + # ASP.NET Core version + ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile new file mode 100644 index 0000000000..81817c025b --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile @@ -0,0 +1,38 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Composite Runtime +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + && dotnet_sha512='7f5c9df8a36f900021cdd6c3e8aa7e1583b1dd413de52d0ee109f44f101479110828f8840082020b86e06301789f075a6ce0018b86af26bf9544fe4f6fc165f2' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# ASP.NET Composite Image +FROM $REPO:8.0.8-azurelinux3.0-distroless-amd64 + +ENV \ + # .NET Runtime version + DOTNET_VERSION=8.0.8 \ + # ASP.NET Core version + ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile new file mode 100644 index 0000000000..cb117e33f9 --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile @@ -0,0 +1,38 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Composite Runtime +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + && dotnet_sha512='6385460af9f0e0377fa92f737dd0c76aaac60c8602c0a872467909738ab95dca67d9f75e10077610a3a7ea52f4abef5a86f50f25eee1c8587426011441d1abfc' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# ASP.NET Composite Image +FROM $REPO:8.0.8-azurelinux3.0-distroless-arm64v8 + +ENV \ + # .NET Runtime version + DOTNET_VERSION=8.0.8 \ + # ASP.NET Core version + ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile new file mode 100644 index 0000000000..d2e43411f3 --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -0,0 +1,28 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + && aspnetcore_sha512='d6c0cc2aac79fbacbf81b597f286763599f66278c17ddb448ce0b93d499bad8f88777d425854e68602945ab18af8a61f1ee59d431d5503006137f86113faa8b2' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf aspnetcore.tar.gz -C /dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz + + +# ASP.NET Core image +FROM $REPO:8.0.8-azurelinux3.0-distroless-extra-amd64 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile new file mode 100644 index 0000000000..f1a2fc2409 --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -0,0 +1,28 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + && aspnetcore_sha512='c3dc9d71fca0a48eda96074cbcef4c9a265c1c4e10cbff38614dd74d79443ae9d1ccd10714764cd041291f81d83c0ed1c307abf89249ab4b6f58a5de952fcffd' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf aspnetcore.tar.gz -C /dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz + + +# ASP.NET Core image +FROM $REPO:8.0.8-azurelinux3.0-distroless-extra-arm64v8 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile new file mode 100644 index 0000000000..4bfe3566db --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -0,0 +1,28 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + && aspnetcore_sha512='d6c0cc2aac79fbacbf81b597f286763599f66278c17ddb448ce0b93d499bad8f88777d425854e68602945ab18af8a61f1ee59d431d5503006137f86113faa8b2' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf aspnetcore.tar.gz -C /dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz + + +# ASP.NET Core image +FROM $REPO:8.0.8-azurelinux3.0-distroless-amd64 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile new file mode 100644 index 0000000000..049d96f988 --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -0,0 +1,28 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + && aspnetcore_sha512='c3dc9d71fca0a48eda96074cbcef4c9a265c1c4e10cbff38614dd74d79443ae9d1ccd10714764cd041291f81d83c0ed1c307abf89249ab4b6f58a5de952fcffd' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf aspnetcore.tar.gz -C /dotnet ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz + + +# ASP.NET Core image +FROM $REPO:8.0.8-azurelinux3.0-distroless-arm64v8 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile new file mode 100644 index 0000000000..baf945d693 --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0/amd64/Dockerfile @@ -0,0 +1,25 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM $REPO:8.0.8-azurelinux3.0-amd64 AS installer + +RUN tdnf install -y \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + && aspnetcore_sha512='d6c0cc2aac79fbacbf81b597f286763599f66278c17ddb448ce0b93d499bad8f88777d425854e68602945ab18af8a61f1ee59d431d5503006137f86113faa8b2' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && tar -oxzf aspnetcore.tar.gz ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz + + +# ASP.NET Core image +FROM $REPO:8.0.8-azurelinux3.0-amd64 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/shared/Microsoft.AspNetCore.App", "/usr/share/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile new file mode 100644 index 0000000000..e91189919e --- /dev/null +++ b/src/aspnet/8.0/azurelinux3.0/arm64v8/Dockerfile @@ -0,0 +1,25 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM $REPO:8.0.8-azurelinux3.0-arm64v8 AS installer + +RUN tdnf install -y \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.8 \ + && curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + && aspnetcore_sha512='c3dc9d71fca0a48eda96074cbcef4c9a265c1c4e10cbff38614dd74d79443ae9d1ccd10714764cd041291f81d83c0ed1c307abf89249ab4b6f58a5de952fcffd' \ + && echo "$aspnetcore_sha512 aspnetcore.tar.gz" | sha512sum -c - \ + && tar -oxzf aspnetcore.tar.gz ./shared/Microsoft.AspNetCore.App \ + && rm aspnetcore.tar.gz + + +# ASP.NET Core image +FROM $REPO:8.0.8-azurelinux3.0-arm64v8 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.8 + +COPY --from=installer ["/shared/Microsoft.AspNetCore.App", "/usr/share/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile new file mode 100644 index 0000000000..58b4c67ef0 --- /dev/null +++ b/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -0,0 +1,73 @@ +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + gawk \ + shadow-utils \ + && tdnf clean all + +# Install .NET's dependencies into a staging location +RUN mkdir /staging \ + && tdnf install -y --releasever=3.0 --installroot /staging \ + prebuilt-ca-certificates \ + \ + # .NET dependencies + glibc \ + icu \ + libgcc \ + libstdc++ \ + openssl-libs \ + tzdata \ + zlib \ + && tdnf clean all --releasever=3.0 --installroot /staging + +# Generate RPM manifest file by appending to the original manifest file from base distroless image +COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +RUN tmpManifestPath="/tmp/rpmmanifest" \ + && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ + && mkdir -p /staging/var/lib/rpmmanifest \ + # Remove duplicates that match on the first field (package name) + && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2 + +# Create a non-root user and group +RUN groupadd \ + --gid=1654 \ + app \ + && useradd -l \ + --uid=1654 \ + --gid=1654 \ + --shell /bin/false \ + --create-home \ + app \ + && install -d -m 0755 -o 1654 -g 1654 "/staging/home/app" \ + && rootOrAppRegex='^\(root\|app\):' \ + && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \ + && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group" + +# Clean up staging +RUN rm -rf /staging/etc/tdnf \ + && rm -rf /staging/run/* \ + && rm -rf /staging/var/cache/tdnf \ + && rm -rf /staging/var/lib/rpm \ + && rm -rf /staging/usr/share/doc \ + && rm -rf /staging/usr/share/man \ + && find /staging/var/log -type f -size +0 -delete + + +# .NET runtime-deps image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 + +ENV \ + # UID of the non-root user 'app' + APP_UID=1654 \ + # Configure web servers to bind to port 8080 when present + ASPNETCORE_HTTP_PORTS=8080 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true + +COPY --from=installer /staging/ / + +# Workaround for https://github.com/moby/moby/issues/38710 +COPY --from=installer --chown=1654:1654 /staging/home/app /home/app + +USER $APP_UID diff --git a/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile new file mode 100644 index 0000000000..58b4c67ef0 --- /dev/null +++ b/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -0,0 +1,73 @@ +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + gawk \ + shadow-utils \ + && tdnf clean all + +# Install .NET's dependencies into a staging location +RUN mkdir /staging \ + && tdnf install -y --releasever=3.0 --installroot /staging \ + prebuilt-ca-certificates \ + \ + # .NET dependencies + glibc \ + icu \ + libgcc \ + libstdc++ \ + openssl-libs \ + tzdata \ + zlib \ + && tdnf clean all --releasever=3.0 --installroot /staging + +# Generate RPM manifest file by appending to the original manifest file from base distroless image +COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +RUN tmpManifestPath="/tmp/rpmmanifest" \ + && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ + && mkdir -p /staging/var/lib/rpmmanifest \ + # Remove duplicates that match on the first field (package name) + && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2 + +# Create a non-root user and group +RUN groupadd \ + --gid=1654 \ + app \ + && useradd -l \ + --uid=1654 \ + --gid=1654 \ + --shell /bin/false \ + --create-home \ + app \ + && install -d -m 0755 -o 1654 -g 1654 "/staging/home/app" \ + && rootOrAppRegex='^\(root\|app\):' \ + && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \ + && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group" + +# Clean up staging +RUN rm -rf /staging/etc/tdnf \ + && rm -rf /staging/run/* \ + && rm -rf /staging/var/cache/tdnf \ + && rm -rf /staging/var/lib/rpm \ + && rm -rf /staging/usr/share/doc \ + && rm -rf /staging/usr/share/man \ + && find /staging/var/log -type f -size +0 -delete + + +# .NET runtime-deps image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 + +ENV \ + # UID of the non-root user 'app' + APP_UID=1654 \ + # Configure web servers to bind to port 8080 when present + ASPNETCORE_HTTP_PORTS=8080 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true + +COPY --from=installer /staging/ / + +# Workaround for https://github.com/moby/moby/issues/38710 +COPY --from=installer --chown=1654:1654 /staging/home/app /home/app + +USER $APP_UID diff --git a/src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile new file mode 100644 index 0000000000..3128e8e2e6 --- /dev/null +++ b/src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -0,0 +1,73 @@ +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + gawk \ + shadow-utils \ + && tdnf clean all + +# Install .NET's dependencies into a staging location +RUN mkdir /staging \ + && tdnf install -y --releasever=3.0 --installroot /staging \ + prebuilt-ca-certificates \ + \ + # .NET dependencies + glibc \ + libgcc \ + libstdc++ \ + openssl-libs \ + zlib \ + && tdnf clean all --releasever=3.0 --installroot /staging + +# Generate RPM manifest file by appending to the original manifest file from base distroless image +COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +RUN tmpManifestPath="/tmp/rpmmanifest" \ + && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ + && mkdir -p /staging/var/lib/rpmmanifest \ + # Remove duplicates that match on the first field (package name) + && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2 + +# Create a non-root user and group +RUN groupadd \ + --gid=1654 \ + app \ + && useradd -l \ + --uid=1654 \ + --gid=1654 \ + --shell /bin/false \ + --create-home \ + app \ + && install -d -m 0755 -o 1654 -g 1654 "/staging/home/app" \ + && rootOrAppRegex='^\(root\|app\):' \ + && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \ + && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group" + +# Clean up staging +RUN rm -rf /staging/etc/tdnf \ + && rm -rf /staging/run/* \ + && rm -rf /staging/var/cache/tdnf \ + && rm -rf /staging/var/lib/rpm \ + && rm -rf /staging/usr/share/doc \ + && rm -rf /staging/usr/share/man \ + && find /staging/var/log -type f -size +0 -delete + + +# .NET runtime-deps image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 + +ENV \ + # UID of the non-root user 'app' + APP_UID=1654 \ + # Configure web servers to bind to port 8080 when present + ASPNETCORE_HTTP_PORTS=8080 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true \ + # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20) + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true + +COPY --from=installer /staging/ / + +# Workaround for https://github.com/moby/moby/issues/38710 +COPY --from=installer --chown=1654:1654 /staging/home/app /home/app + +USER $APP_UID diff --git a/src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile new file mode 100644 index 0000000000..3128e8e2e6 --- /dev/null +++ b/src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -0,0 +1,73 @@ +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + gawk \ + shadow-utils \ + && tdnf clean all + +# Install .NET's dependencies into a staging location +RUN mkdir /staging \ + && tdnf install -y --releasever=3.0 --installroot /staging \ + prebuilt-ca-certificates \ + \ + # .NET dependencies + glibc \ + libgcc \ + libstdc++ \ + openssl-libs \ + zlib \ + && tdnf clean all --releasever=3.0 --installroot /staging + +# Generate RPM manifest file by appending to the original manifest file from base distroless image +COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +RUN tmpManifestPath="/tmp/rpmmanifest" \ + && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ + && mkdir -p /staging/var/lib/rpmmanifest \ + # Remove duplicates that match on the first field (package name) + && tac $tmpManifestPath | gawk '!x[$1]++' | sort > /staging/var/lib/rpmmanifest/container-manifest-2 + +# Create a non-root user and group +RUN groupadd \ + --gid=1654 \ + app \ + && useradd -l \ + --uid=1654 \ + --gid=1654 \ + --shell /bin/false \ + --create-home \ + app \ + && install -d -m 0755 -o 1654 -g 1654 "/staging/home/app" \ + && rootOrAppRegex='^\(root\|app\):' \ + && cat /etc/passwd | grep $rootOrAppRegex > "/staging/etc/passwd" \ + && cat /etc/group | grep $rootOrAppRegex > "/staging/etc/group" + +# Clean up staging +RUN rm -rf /staging/etc/tdnf \ + && rm -rf /staging/run/* \ + && rm -rf /staging/var/cache/tdnf \ + && rm -rf /staging/var/lib/rpm \ + && rm -rf /staging/usr/share/doc \ + && rm -rf /staging/usr/share/man \ + && find /staging/var/log -type f -size +0 -delete + + +# .NET runtime-deps image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 + +ENV \ + # UID of the non-root user 'app' + APP_UID=1654 \ + # Configure web servers to bind to port 8080 when present + ASPNETCORE_HTTP_PORTS=8080 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true \ + # Set the invariant mode since ICU package isn't included (see https://github.com/dotnet/announcements/issues/20) + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=true + +COPY --from=installer /staging/ / + +# Workaround for https://github.com/moby/moby/issues/38710 +COPY --from=installer --chown=1654:1654 /staging/home/app /home/app + +USER $APP_UID diff --git a/src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile new file mode 100644 index 0000000000..b02106ae04 --- /dev/null +++ b/src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile @@ -0,0 +1,37 @@ +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 + +ENV \ + # UID of the non-root user 'app' + APP_UID=1654 \ + # Configure web servers to bind to port 8080 when present + ASPNETCORE_HTTP_PORTS=8080 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true + +RUN tdnf install -y \ + ca-certificates \ + \ + # .NET dependencies + glibc \ + icu \ + libgcc \ + libstdc++ \ + openssl-libs \ + tzdata \ + zlib \ + && tdnf clean all + +# Create a non-root user and group +RUN tdnf install -y \ + shadow-utils \ + && groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app \ + && tdnf autoremove -y \ + shadow-utils \ + && tdnf clean all diff --git a/src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile new file mode 100644 index 0000000000..b02106ae04 --- /dev/null +++ b/src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile @@ -0,0 +1,37 @@ +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 + +ENV \ + # UID of the non-root user 'app' + APP_UID=1654 \ + # Configure web servers to bind to port 8080 when present + ASPNETCORE_HTTP_PORTS=8080 \ + # Enable detection of running in a container + DOTNET_RUNNING_IN_CONTAINER=true + +RUN tdnf install -y \ + ca-certificates \ + \ + # .NET dependencies + glibc \ + icu \ + libgcc \ + libstdc++ \ + openssl-libs \ + tzdata \ + zlib \ + && tdnf clean all + +# Create a non-root user and group +RUN tdnf install -y \ + shadow-utils \ + && groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app \ + && tdnf autoremove -y \ + shadow-utils \ + && tdnf clean all diff --git a/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile new file mode 100644 index 0000000000..1ebf0d4f7c --- /dev/null +++ b/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -0,0 +1,35 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + && dotnet_sha512='8f5220098c562fa3490417748eb9f4f9ca1551f7155728b9ebb1924359c63c18dedef643bcd89ec67b59cb5b1b9de7283ee156ef381ffb16801b516dba9b1b0f' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# .NET runtime image +FROM $REPO:8.0.8-azurelinux3.0-distroless-extra-amd64 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.8 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile new file mode 100644 index 0000000000..173d51260c --- /dev/null +++ b/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -0,0 +1,35 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + && dotnet_sha512='246fb7e5edb51db93421c6bb7420f7a358430b98b224a71fb70e71a2bce0bc91f853aa89109f2188b0ab28532a245c3d52baac163463e01a02019dea37fd39f2' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# .NET runtime image +FROM $REPO:8.0.8-azurelinux3.0-distroless-extra-arm64v8 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.8 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile new file mode 100644 index 0000000000..681b394173 --- /dev/null +++ b/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -0,0 +1,35 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + && dotnet_sha512='8f5220098c562fa3490417748eb9f4f9ca1551f7155728b9ebb1924359c63c18dedef643bcd89ec67b59cb5b1b9de7283ee156ef381ffb16801b516dba9b1b0f' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# .NET runtime image +FROM $REPO:8.0.8-azurelinux3.0-distroless-amd64 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.8 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile new file mode 100644 index 0000000000..589ce2b66e --- /dev/null +++ b/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -0,0 +1,35 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + && dotnet_sha512='246fb7e5edb51db93421c6bb7420f7a358430b98b224a71fb70e71a2bce0bc91f853aa89109f2188b0ab28532a245c3d52baac163463e01a02019dea37fd39f2' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# .NET runtime image +FROM $REPO:8.0.8-azurelinux3.0-distroless-arm64v8 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.8 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/runtime/8.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/8.0/azurelinux3.0/amd64/Dockerfile new file mode 100644 index 0000000000..185971042c --- /dev/null +++ b/src/runtime/8.0/azurelinux3.0/amd64/Dockerfile @@ -0,0 +1,28 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM $REPO:8.0.8-azurelinux3.0-amd64 AS installer + +RUN tdnf install -y \ + tar \ + && tdnf clean all + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + && dotnet_sha512='8f5220098c562fa3490417748eb9f4f9ca1551f7155728b9ebb1924359c63c18dedef643bcd89ec67b59cb5b1b9de7283ee156ef381ffb16801b516dba9b1b0f' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet \ + && rm dotnet.tar.gz + + +# .NET runtime image +FROM $REPO:8.0.8-azurelinux3.0-amd64 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.8 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile new file mode 100644 index 0000000000..2f348d11a6 --- /dev/null +++ b/src/runtime/8.0/azurelinux3.0/arm64v8/Dockerfile @@ -0,0 +1,28 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM $REPO:8.0.8-azurelinux3.0-arm64v8 AS installer + +RUN tdnf install -y \ + tar \ + && tdnf clean all + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.8 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + && dotnet_sha512='246fb7e5edb51db93421c6bb7420f7a358430b98b224a71fb70e71a2bce0bc91f853aa89109f2188b0ab28532a245c3d52baac163463e01a02019dea37fd39f2' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet \ + && rm dotnet.tar.gz + + +# .NET runtime image +FROM $REPO:8.0.8-azurelinux3.0-arm64v8 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.8 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/sdk/8.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/8.0/azurelinux3.0/amd64/Dockerfile index d7d91b1029..2549936771 100644 --- a/src/sdk/8.0/azurelinux3.0/amd64/Dockerfile +++ b/src/sdk/8.0/azurelinux3.0/amd64/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet -FROM $REPO:8.0.4-azurelinux3.0-amd64 +FROM $REPO:8.0.8-azurelinux3.0-amd64 ENV \ # Do not generate certificate @@ -7,7 +7,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=8.0.204 \ + DOTNET_SDK_VERSION=8.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance @@ -23,7 +23,7 @@ RUN tdnf install -y \ # Install .NET SDK RUN curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-x64.tar.gz \ - && dotnet_sha512='b45d3e3bc039d50764bfbe393b26cc929d93b22d69da74af6d35d4038ebcbc2f8410b047cdd0425c954d245e2594755c9f293c09f1ded3c97d33aebfaf878b5f' \ + && dotnet_sha512='8a4c637746177c4da6ceec63e23a1f499d61d050aa72bc599841550557ff7b1a15a034044c3987b230fdca4e5113de12b1676f5a2366e9946bd94aec1e51a42b' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm dotnet.tar.gz \ diff --git a/src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile index 74b45fde10..41bff4d35a 100644 --- a/src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/sdk/8.0/azurelinux3.0/arm64v8/Dockerfile @@ -1,5 +1,5 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet -FROM $REPO:8.0.4-azurelinux3.0-arm64v8 +FROM $REPO:8.0.8-azurelinux3.0-arm64v8 ENV \ # Do not generate certificate @@ -7,7 +7,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=8.0.204 \ + DOTNET_SDK_VERSION=8.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance @@ -23,7 +23,7 @@ RUN tdnf install -y \ # Install .NET SDK RUN curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-arm64.tar.gz \ - && dotnet_sha512='7000b559efe502e9a799e9fccb6bccc2e39eb21331d6cb2be54f389e357436b84f5ccbcc73245df647749ee32d27f7fb8b7737d449312f0db7dd3409f8e12443' \ + && dotnet_sha512='d27b4ddd864478fc4655485cef0773411fb934c816fb3dcdafb18f670212c5389661a8255ca8a54562613815712f5ea23e5d8ad1cce4e00a3f8a82c9b4a6b127' \ && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm dotnet.tar.gz \ From 0806c687cbd28510c4fd2576057145ddac1ab9c3 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 9 Aug 2024 11:30:04 -0700 Subject: [PATCH 2/2] Use Azure Linux 3.0 images from MAR (#5779) --- eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux | 4 ++-- eng/dockerfile-templates/aspnet/Dockerfile.linux | 3 ++- eng/dockerfile-templates/aspnet/Dockerfile.linux-composite | 3 ++- eng/dockerfile-templates/monitor-base/Dockerfile.linux | 3 ++- eng/dockerfile-templates/monitor/Dockerfile.linux | 3 ++- .../monitor/Dockerfile.linux.extensions | 3 ++- eng/dockerfile-templates/runtime-deps/Dockerfile | 2 +- .../runtime-deps/Dockerfile.distroless-mariner | 2 +- eng/dockerfile-templates/runtime/Dockerfile.linux | 3 ++- .../amd64/Dockerfile | 2 +- .../arm64v8/Dockerfile | 2 +- .../8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile | 2 +- .../azurelinux3.0-distroless-composite/arm64v8/Dockerfile | 2 +- .../8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile | 2 +- .../8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile | 2 +- src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile | 2 +- src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile | 2 +- .../amd64/Dockerfile | 2 +- .../arm64v8/Dockerfile | 2 +- .../9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile | 2 +- .../azurelinux3.0-distroless-composite/arm64v8/Dockerfile | 2 +- .../9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile | 2 +- .../9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile | 2 +- src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile | 2 +- src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile | 2 +- src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile | 2 +- .../9.0/azurelinux-distroless/arm64v8/Dockerfile | 2 +- src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile | 2 +- src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile | 2 +- .../8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile | 6 +++--- .../8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile | 6 +++--- .../8.0/azurelinux3.0-distroless/amd64/Dockerfile | 6 +++--- .../8.0/azurelinux3.0-distroless/arm64v8/Dockerfile | 6 +++--- src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile | 2 +- src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile | 2 +- .../9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile | 6 +++--- .../9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile | 6 +++--- .../9.0/azurelinux3.0-distroless/amd64/Dockerfile | 6 +++--- .../9.0/azurelinux3.0-distroless/arm64v8/Dockerfile | 6 +++--- src/runtime-deps/9.0/azurelinux3.0/amd64/Dockerfile | 2 +- src/runtime-deps/9.0/azurelinux3.0/arm64v8/Dockerfile | 2 +- .../8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile | 2 +- .../8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile | 2 +- src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile | 2 +- src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile | 2 +- .../9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile | 2 +- .../9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile | 2 +- src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile | 2 +- src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile | 2 +- 49 files changed, 72 insertions(+), 66 deletions(-) diff --git a/eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux b/eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux index 2a98b57938..ec233f2ef7 100644 --- a/eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux +++ b/eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux @@ -6,8 +6,8 @@ cat("$REPO:", VARIABLES[cat("dotnet|", dotnetMajorMinor, "|product-version")], "-", OS_VERSION, "-extra", ARCH_TAG_SUFFIX) ^ set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^ set installerImageTag to when(isAzureLinux, - cat( - when(find(OS_VERSION, "3.0") >= 0, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner"), + cat("mcr.microsoft.com/", + when(find(OS_VERSION, "3.0") >= 0, "azurelinux", "cbl-mariner"), "/base/core:", OS_VERSION_NUMBER), cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.linux b/eng/dockerfile-templates/aspnet/Dockerfile.linux index 4550105174..3cd3e27618 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile.linux +++ b/eng/dockerfile-templates/aspnet/Dockerfile.linux @@ -25,7 +25,8 @@ set osVersionBase to when(osVersionBase = "noble" && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^ set installerImageTag to when(isDistrolessAzureLinux, - cat(when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner"), + cat("mcr.microsoft.com/" + when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"), "/base/core:", OS_VERSION_NUMBER), when(isAlpine || isFullAzureLinux, diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite b/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite index a3b52a19e8..1c21b49fa5 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite +++ b/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite @@ -20,7 +20,8 @@ set osVersionBase to when(osVersionBase = "noble" && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^ set installerImageTag to when(isDistrolessAzureLinux, - cat(when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner"), + cat("mcr.microsoft.com/", + when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"), "/base/core:", OS_VERSION_NUMBER), when(isAlpine || isFullAzureLinux, diff --git a/eng/dockerfile-templates/monitor-base/Dockerfile.linux b/eng/dockerfile-templates/monitor-base/Dockerfile.linux index 1400605aac..66a6152a6c 100644 --- a/eng/dockerfile-templates/monitor-base/Dockerfile.linux +++ b/eng/dockerfile-templates/monitor-base/Dockerfile.linux @@ -8,7 +8,8 @@ cat("$REPO:", VARIABLES[cat("dotnet|", dotnetMajorMinor, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^ set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^ set installerImageTag to when(isAzureLinux, - cat(when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner"), + cat("mcr.microsoft.com/" + when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"), "/base/core:", OS_VERSION_NUMBER), cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) diff --git a/eng/dockerfile-templates/monitor/Dockerfile.linux b/eng/dockerfile-templates/monitor/Dockerfile.linux index 402749212f..55fad685b2 100644 --- a/eng/dockerfile-templates/monitor/Dockerfile.linux +++ b/eng/dockerfile-templates/monitor/Dockerfile.linux @@ -11,7 +11,8 @@ cat("$REPO:", VARIABLES[cat("dotnet|", dotnetMajorMinor, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^ set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^ set installerImageTag to when(isAzureLinux, - cat(when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner"), + cat("mcr.microsoft.com/", + when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"), "/base/core:", OS_VERSION_NUMBER), when(isAlpine, diff --git a/eng/dockerfile-templates/monitor/Dockerfile.linux.extensions b/eng/dockerfile-templates/monitor/Dockerfile.linux.extensions index d39e321656..827282e4c1 100644 --- a/eng/dockerfile-templates/monitor/Dockerfile.linux.extensions +++ b/eng/dockerfile-templates/monitor/Dockerfile.linux.extensions @@ -11,7 +11,8 @@ cat("$REPO:", VARIABLES[cat("monitor|", monitorMajorMinor, "|product-version")], monitorBaseTagOsSuffix, ARCH_TAG_SUFFIX) ^ set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^ set installerImageTag to when(isAzureLinux, - cat(when(find(OS_VERSION, "3.0") >= 0, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner"), + cat("mcr.microsoft.com/" + when(find(OS_VERSION, "3.0") >= 0, "azurelinux", "cbl-mariner"), "/base/core:", OS_VERSION_NUMBER), cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile b/eng/dockerfile-templates/runtime-deps/Dockerfile index ad074d3eec..f4e972015a 100644 --- a/eng/dockerfile-templates/runtime-deps/Dockerfile +++ b/eng/dockerfile-templates/runtime-deps/Dockerfile @@ -21,7 +21,7 @@ "ubuntu.azurecr.io/ubuntu", when(isAzureLinux, when(find(OS_VERSION_NUMBER, "3.0") >= 0, - "azurelinuxpreview.azurecr.io/public/azurelinux/base/core", + "mcr.microsoft.com/azurelinux/base/core", "mcr.microsoft.com/cbl-mariner/base/core"), "")))) ^ set baseImageTag to when(isAlpine || isAzureLinux, OS_VERSION_NUMBER, OS_VERSION) ^ diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner b/eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner index 207c74bccb..19adfc79bf 100644 --- a/eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner +++ b/eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-mariner @@ -6,7 +6,7 @@ set isAzureLinux3 to find(OS_VERSION_NUMBER, "3.0") >= 0 ^ set distrolessStagingDir to "/staging" ^ - set marinerRepo to when(isAzureLinux3, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner") ^ + set marinerRepo to when(isAzureLinux3, "mcr.microsoft.com/azurelinux", "mcr.microsoft.com/cbl-mariner") ^ set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^ set baseImage to cat(marinerRepo, "/distroless/minimal:", OS_VERSION_NUMBER) ^ set username to "app" ^ diff --git a/eng/dockerfile-templates/runtime/Dockerfile.linux b/eng/dockerfile-templates/runtime/Dockerfile.linux index 7bbd77a6ac..b1bf5191fa 100644 --- a/eng/dockerfile-templates/runtime/Dockerfile.linux +++ b/eng/dockerfile-templates/runtime/Dockerfile.linux @@ -25,7 +25,8 @@ set osVersionBase to when(osVersionBase = "noble" && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^ set installerImageTag to when(isDistrolessAzureLinux, - cat(when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinuxpreview.azurecr.io/public/azurelinux", "mcr.microsoft.com/cbl-mariner"), + cat("mcr.microsoft.com/" + when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"), "/base/core:", OS_VERSION_NUMBER), when(isAlpine || isFullAzureLinux, diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile index a1a75acc2c..1f746b4654 100644 --- a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile +++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile index 98ea05c130..7f9653df83 100644 --- a/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile +++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile index 81817c025b..915af3618c 100644 --- a/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile +++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile index cb117e33f9..6625365150 100644 --- a/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile +++ b/src/aspnet/8.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index d2e43411f3..b75b522860 100644 --- a/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/aspnet/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index f1a2fc2409..440d823864 100644 --- a/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/aspnet/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile index 4bfe3566db..a4a5dbb90f 100644 --- a/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/aspnet/8.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile index 049d96f988..fec69c63c0 100644 --- a/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/aspnet/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile index add5df8ed3..ba7ac5e915 100644 --- a/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile +++ b/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile index 55e3afd451..45247d68ee 100644 --- a/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile +++ b/src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile index 3fd0dc3043..5e06ce7846 100644 --- a/src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile +++ b/src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile index 55e3afd451..45247d68ee 100644 --- a/src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile +++ b/src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index 79171429fe..cf0e0326fa 100644 --- a/src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/aspnet/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index 9da4d4c630..d241ae8077 100644 --- a/src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/aspnet/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile index d783d5a63f..0ed61e6ffc 100644 --- a/src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/aspnet/9.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile index 9da4d4c630..d241ae8077 100644 --- a/src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/aspnet/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile index 97d7dbe0e7..8c9157bf5b 100644 --- a/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile +++ b/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile index 797970f73f..e9cdc48518 100644 --- a/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile +++ b/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile b/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile index 184af1bb83..75054d47b2 100644 --- a/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile +++ b/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/monitor/base # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile index eafab0594a..b1c4cc9f77 100644 --- a/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile +++ b/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/monitor/base # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index 58b4c67ef0..15a4c72e56 100644 --- a/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ gawk \ @@ -22,7 +22,7 @@ RUN mkdir /staging \ && tdnf clean all --releasever=3.0 --installroot /staging # Generate RPM manifest file by appending to the original manifest file from base distroless image -COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest RUN tmpManifestPath="/tmp/rpmmanifest" \ && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ && mkdir -p /staging/var/lib/rpmmanifest \ @@ -55,7 +55,7 @@ RUN rm -rf /staging/etc/tdnf \ # .NET runtime-deps image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 +FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index 58b4c67ef0..15a4c72e56 100644 --- a/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ gawk \ @@ -22,7 +22,7 @@ RUN mkdir /staging \ && tdnf clean all --releasever=3.0 --installroot /staging # Generate RPM manifest file by appending to the original manifest file from base distroless image -COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest RUN tmpManifestPath="/tmp/rpmmanifest" \ && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ && mkdir -p /staging/var/lib/rpmmanifest \ @@ -55,7 +55,7 @@ RUN rm -rf /staging/etc/tdnf \ # .NET runtime-deps image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 +FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile index 3128e8e2e6..c772d8c559 100644 --- a/src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/runtime-deps/8.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ gawk \ @@ -20,7 +20,7 @@ RUN mkdir /staging \ && tdnf clean all --releasever=3.0 --installroot /staging # Generate RPM manifest file by appending to the original manifest file from base distroless image -COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest RUN tmpManifestPath="/tmp/rpmmanifest" \ && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ && mkdir -p /staging/var/lib/rpmmanifest \ @@ -53,7 +53,7 @@ RUN rm -rf /staging/etc/tdnf \ # .NET runtime-deps image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 +FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile index 3128e8e2e6..c772d8c559 100644 --- a/src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ gawk \ @@ -20,7 +20,7 @@ RUN mkdir /staging \ && tdnf clean all --releasever=3.0 --installroot /staging # Generate RPM manifest file by appending to the original manifest file from base distroless image -COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest RUN tmpManifestPath="/tmp/rpmmanifest" \ && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ && mkdir -p /staging/var/lib/rpmmanifest \ @@ -53,7 +53,7 @@ RUN rm -rf /staging/etc/tdnf \ # .NET runtime-deps image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 +FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile index b02106ae04..0b72528fed 100644 --- a/src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile +++ b/src/runtime-deps/8.0/azurelinux3.0/amd64/Dockerfile @@ -1,4 +1,4 @@ -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 +FROM mcr.microsoft.com/azurelinux/base/core:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile index b02106ae04..0b72528fed 100644 --- a/src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/azurelinux3.0/arm64v8/Dockerfile @@ -1,4 +1,4 @@ -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 +FROM mcr.microsoft.com/azurelinux/base/core:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime-deps/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index 807a98b911..b772aa494f 100644 --- a/src/runtime-deps/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/runtime-deps/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ gawk \ @@ -21,7 +21,7 @@ RUN mkdir /staging \ && tdnf clean all --releasever=3.0 --installroot /staging # Generate RPM manifest file by appending to the original manifest file from base distroless image -COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest RUN tmpManifestPath="/tmp/rpmmanifest" \ && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ && mkdir -p /staging/var/lib/rpmmanifest \ @@ -54,7 +54,7 @@ RUN rm -rf /staging/etc/tdnf \ # .NET runtime-deps image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 +FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime-deps/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index 807a98b911..b772aa494f 100644 --- a/src/runtime-deps/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ gawk \ @@ -21,7 +21,7 @@ RUN mkdir /staging \ && tdnf clean all --releasever=3.0 --installroot /staging # Generate RPM manifest file by appending to the original manifest file from base distroless image -COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest RUN tmpManifestPath="/tmp/rpmmanifest" \ && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ && mkdir -p /staging/var/lib/rpmmanifest \ @@ -54,7 +54,7 @@ RUN rm -rf /staging/etc/tdnf \ # .NET runtime-deps image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 +FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/9.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime-deps/9.0/azurelinux3.0-distroless/amd64/Dockerfile index 84543a0d93..39adf24f0e 100644 --- a/src/runtime-deps/9.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/runtime-deps/9.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ gawk \ @@ -19,7 +19,7 @@ RUN mkdir /staging \ && tdnf clean all --releasever=3.0 --installroot /staging # Generate RPM manifest file by appending to the original manifest file from base distroless image -COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest RUN tmpManifestPath="/tmp/rpmmanifest" \ && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ && mkdir -p /staging/var/lib/rpmmanifest \ @@ -52,7 +52,7 @@ RUN rm -rf /staging/etc/tdnf \ # .NET runtime-deps image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 +FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime-deps/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile index 84543a0d93..39adf24f0e 100644 --- a/src/runtime-deps/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ gawk \ @@ -19,7 +19,7 @@ RUN mkdir /staging \ && tdnf clean all --releasever=3.0 --installroot /staging # Generate RPM manifest file by appending to the original manifest file from base distroless image -COPY --from=azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest +COPY --from=mcr.microsoft.com/azurelinux/distroless/minimal:3.0 /var/lib/rpmmanifest/container-manifest-2 /tmp/rpmmanifest RUN tmpManifestPath="/tmp/rpmmanifest" \ && rpm --query --all --queryformat "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" --root /staging | grep -v gpg-pubkey >> $tmpManifestPath \ && mkdir -p /staging/var/lib/rpmmanifest \ @@ -52,7 +52,7 @@ RUN rm -rf /staging/etc/tdnf \ # .NET runtime-deps image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/distroless/minimal:3.0 +FROM mcr.microsoft.com/azurelinux/distroless/minimal:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/9.0/azurelinux3.0/amd64/Dockerfile b/src/runtime-deps/9.0/azurelinux3.0/amd64/Dockerfile index ae75073ffd..4eb65bdd6c 100644 --- a/src/runtime-deps/9.0/azurelinux3.0/amd64/Dockerfile +++ b/src/runtime-deps/9.0/azurelinux3.0/amd64/Dockerfile @@ -1,4 +1,4 @@ -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 +FROM mcr.microsoft.com/azurelinux/base/core:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/9.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime-deps/9.0/azurelinux3.0/arm64v8/Dockerfile index ae75073ffd..4eb65bdd6c 100644 --- a/src/runtime-deps/9.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/azurelinux3.0/arm64v8/Dockerfile @@ -1,4 +1,4 @@ -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 +FROM mcr.microsoft.com/azurelinux/base/core:3.0 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index 1ebf0d4f7c..643f0f7056 100644 --- a/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/runtime/8.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index 173d51260c..7289c174b4 100644 --- a/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/runtime/8.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile index 681b394173..2ce5e17c7d 100644 --- a/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/runtime/8.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile index 589ce2b66e..6fb133e166 100644 --- a/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/runtime/8.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index e08a9aa81f..876a960f77 100644 --- a/src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index a2a33aa6d2..b2f2ef7c1e 100644 --- a/src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile index 8ed5d39b18..2eeb80829d 100644 --- a/src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ diff --git a/src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile index 175e4116ba..8b6202a59e 100644 --- a/src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \