From cf854849fe96f30a107996be7864e0f12510e42e Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 22 Oct 2026 10:30:10 -0700 Subject: [PATCH] Use updated Azure Linux 4 base images on main Port dotnet/dotnet-docker#7431 from nightly, source commit b79fdb97d7a2e2a497bb8cf315eb4fdec329078a, preserving main product versions and image sets. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3d64d0a3-bafc-47a9-8526-089d13f0f7c7 --- .../aspire-dashboard/Dockerfile.linux | 3 +-- eng/dockerfile-templates/aspnet/Dockerfile.linux | 3 +-- .../aspnet/Dockerfile.linux-composite | 3 +-- eng/dockerfile-templates/monitor-base/Dockerfile.linux | 3 +-- eng/dockerfile-templates/monitor/Dockerfile.linux | 3 +-- eng/dockerfile-templates/runtime-deps/Dockerfile | 10 +++++----- .../runtime-deps/Dockerfile.distroless-azurelinux | 6 +++--- eng/dockerfile-templates/runtime/Dockerfile.linux | 3 +-- eng/dockerfile-templates/yarp/Dockerfile.linux | 2 +- manifest.versions.json | 6 ++++-- .../amd64/Dockerfile | 2 +- .../arm64v8/Dockerfile | 2 +- .../amd64/Dockerfile | 2 +- .../arm64v8/Dockerfile | 2 +- .../azurelinux4.0-distroless-extra/amd64/Dockerfile | 2 +- .../azurelinux4.0-distroless-extra/arm64v8/Dockerfile | 2 +- .../11.0/azurelinux4.0-distroless/amd64/Dockerfile | 2 +- .../11.0/azurelinux4.0-distroless/arm64v8/Dockerfile | 2 +- .../azurelinux4.0-distroless-extra/amd64/Dockerfile | 4 ++-- .../azurelinux4.0-distroless-extra/arm64v8/Dockerfile | 4 ++-- .../11.0/azurelinux4.0-distroless/amd64/Dockerfile | 4 ++-- .../11.0/azurelinux4.0-distroless/arm64v8/Dockerfile | 4 ++-- src/runtime-deps/11.0/azurelinux4.0/amd64/Dockerfile | 2 +- src/runtime-deps/11.0/azurelinux4.0/arm64v8/Dockerfile | 2 +- .../azurelinux4.0-distroless-extra/amd64/Dockerfile | 2 +- .../azurelinux4.0-distroless-extra/arm64v8/Dockerfile | 2 +- .../11.0/azurelinux4.0-distroless/amd64/Dockerfile | 2 +- .../11.0/azurelinux4.0-distroless/arm64v8/Dockerfile | 2 +- ...relinux4.0-distroless-amd64-Dockerfile.approved.txt | 2 +- ...linux4.0-distroless-arm64v8-Dockerfile.approved.txt | 2 +- ...-distroless-composite-amd64-Dockerfile.approved.txt | 2 +- ...istroless-composite-arm64v8-Dockerfile.approved.txt | 2 +- ...oless-composite-extra-amd64-Dockerfile.approved.txt | 2 +- ...ess-composite-extra-arm64v8-Dockerfile.approved.txt | 2 +- ...x4.0-distroless-extra-amd64-Dockerfile.approved.txt | 2 +- ....0-distroless-extra-arm64v8-Dockerfile.approved.txt | 2 +- ...relinux4.0-distroless-amd64-Dockerfile.approved.txt | 2 +- ...linux4.0-distroless-arm64v8-Dockerfile.approved.txt | 2 +- ...x4.0-distroless-extra-amd64-Dockerfile.approved.txt | 2 +- ....0-distroless-extra-arm64v8-Dockerfile.approved.txt | 2 +- ...ps-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt | 2 +- ...-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt | 2 +- ...relinux4.0-distroless-amd64-Dockerfile.approved.txt | 4 ++-- ...linux4.0-distroless-arm64v8-Dockerfile.approved.txt | 4 ++-- ...x4.0-distroless-extra-amd64-Dockerfile.approved.txt | 4 ++-- ....0-distroless-extra-arm64v8-Dockerfile.approved.txt | 4 ++-- .../Microsoft.DotNet.Docker.Tests/ProductImageTests.cs | 7 ------- 47 files changed, 63 insertions(+), 74 deletions(-) diff --git a/eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux b/eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux index dd4817bb62..d3ef159ad1 100644 --- a/eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux +++ b/eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux @@ -7,8 +7,7 @@ cat("$REPO:", VARIABLES[cat("dotnet|11.0|product-version")], "-", OS_VERSION, "-extra", ARCH_TAG_SUFFIX) ^ set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^ set installerImageTag to when(isAzureLinux, - cat("mcr.microsoft.com/azurelinux/base/core:", - OS_VERSION_NUMBER), + VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")], cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^ set baseUrl to VARIABLES[cat("aspire-dashboard|base-url|", VARIABLES["branch"])] ^ diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.linux b/eng/dockerfile-templates/aspnet/Dockerfile.linux index 391a057b03..b494ca5b58 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile.linux +++ b/eng/dockerfile-templates/aspnet/Dockerfile.linux @@ -24,8 +24,7 @@ set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^ set installerImageTag to when(isDistrolessAzureLinux, - cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:", - OS_VERSION_NUMBER), + VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")], when(isAlpine || isFullAzureLinux, runtimeBaseTag, cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl"))) ^ diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite b/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite index 351660a07f..163e4e5d68 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite +++ b/eng/dockerfile-templates/aspnet/Dockerfile.linux-composite @@ -21,8 +21,7 @@ set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^ set installerImageTag to when(isDistrolessAzureLinux, - cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:", - OS_VERSION_NUMBER), + VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")], when(isAlpine || isFullAzureLinux, runtimeDepsBaseTag, cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl"))) diff --git a/eng/dockerfile-templates/monitor-base/Dockerfile.linux b/eng/dockerfile-templates/monitor-base/Dockerfile.linux index 4b6a22b019..3f292d36cb 100644 --- a/eng/dockerfile-templates/monitor-base/Dockerfile.linux +++ b/eng/dockerfile-templates/monitor-base/Dockerfile.linux @@ -28,8 +28,7 @@ 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("mcr.microsoft.com/azurelinux/base/core:", - OS_VERSION_NUMBER), + VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")], cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^ set monitorBaseTemplate to when(monitorMajor != "8" && monitorMajor != "9", "Dockerfile.linux.install-monitor-base.10", "Dockerfile.linux.install-monitor-base") }}ARG REPO=mcr.microsoft.com/dotnet/aspnet diff --git a/eng/dockerfile-templates/monitor/Dockerfile.linux b/eng/dockerfile-templates/monitor/Dockerfile.linux index 69affed272..dfbdc95979 100644 --- a/eng/dockerfile-templates/monitor/Dockerfile.linux +++ b/eng/dockerfile-templates/monitor/Dockerfile.linux @@ -31,8 +31,7 @@ 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("mcr.microsoft.com/azurelinux/base/core:", - OS_VERSION_NUMBER), + VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")], cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^ set extensionsTemplate to when(monitorMajor != "8" && monitorMajor != "9", "Dockerfile.linux.install-extensions.10", "Dockerfile.linux.install-extensions") }}ARG REPO=mcr.microsoft.com/dotnet/monitor/base diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile b/eng/dockerfile-templates/runtime-deps/Dockerfile index 990d70975a..544449f19a 100644 --- a/eng/dockerfile-templates/runtime-deps/Dockerfile +++ b/eng/dockerfile-templates/runtime-deps/Dockerfile @@ -15,11 +15,11 @@ cat(ARCH_VERSIONED, "/debian"), when(isUbuntu, "ubuntu.azurecr.io/ubuntu", - when(isAzureLinux, - cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core"), - "")))) ^ - set baseImageTag to when(isAlpine || isAzureLinux, OS_VERSION_NUMBER, OS_VERSION) ^ - set baseImage to cat(baseImageRepo, ":", baseImageTag) ^ + ""))) ^ + set baseImageTag to when(isAlpine, OS_VERSION_NUMBER, OS_VERSION) ^ + set baseImage to when(isAzureLinux, + VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")], + cat(baseImageRepo, ":", baseImageTag)) ^ set useGlobalizationInvariantMode to !ARGS["is-extra"] && (isDistroless || isAlpine) ^ set username to "app" ^ diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-azurelinux b/eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-azurelinux index aa5a2f9965..0a7430e414 100644 --- a/eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-azurelinux +++ b/eng/dockerfile-templates/runtime-deps/Dockerfile.distroless-azurelinux @@ -5,8 +5,8 @@ for example globalization support ^ set distrolessStagingDir to "/staging" ^ - set azureLinuxRepo to VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")] ^ - set baseImage to cat(azureLinuxRepo, "/distroless/minimal:", OS_VERSION_NUMBER) ^ + set installerImage to VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")] ^ + set baseImage to VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|distroless-minimal")] ^ set isAzureLinux3 to defined(match(OS_VERSION, "^azurelinux3")) ^ set pkgMgrDir to when(isAzureLinux3, "tdnf", "dnf") ^ set username to "app" ^ @@ -14,7 +14,7 @@ set uid to 1654 ^ set gid to uid }}# Installer image -FROM {{azureLinuxRepo}}/base/core:{{OS_VERSION_NUMBER}} AS installer +FROM {{installerImage}} AS installer RUN {{InsertTemplate("../Dockerfile.linux.install-pkgs", [ diff --git a/eng/dockerfile-templates/runtime/Dockerfile.linux b/eng/dockerfile-templates/runtime/Dockerfile.linux index 4014f43089..1f4d3d51b3 100644 --- a/eng/dockerfile-templates/runtime/Dockerfile.linux +++ b/eng/dockerfile-templates/runtime/Dockerfile.linux @@ -25,8 +25,7 @@ set osVersionBase to when(isUbuntu && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^ set installerImageTag to when(isDistrolessAzureLinux, - cat(VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|repo")], "/base/core:", - OS_VERSION_NUMBER), + VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")], when(isAlpine || isFullAzureLinux, runtimeDepsBaseTag, cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl"))) diff --git a/eng/dockerfile-templates/yarp/Dockerfile.linux b/eng/dockerfile-templates/yarp/Dockerfile.linux index 9c77848461..3f4d9c8fe6 100644 --- a/eng/dockerfile-templates/yarp/Dockerfile.linux +++ b/eng/dockerfile-templates/yarp/Dockerfile.linux @@ -3,7 +3,7 @@ set yarpMajorMinor to cat(yarpVersionParts[0], ".", yarpVersionParts[1]) ^ set aspnetBaseTag to cat("$REPO:", VARIABLES[cat("dotnet|9.0|fixed-tag")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^ - set installerImageTag to cat("mcr.microsoft.com/azurelinux", "/base/core:", OS_VERSION_NUMBER) ^ + set installerImageTag to VARIABLES[cat("azurelinux|", OS_VERSION_NUMBER, "|core")] ^ set baseUrl to VARIABLES[cat("yarp|", yarpMajorMinor, "|base-url|", VARIABLES["branch"])] ^ set baseChecksumUrl to VARIABLES[cat("yarp|", yarpMajorMinor, "|base-url|checksums|", VARIABLES["branch"])] ^ diff --git a/manifest.versions.json b/manifest.versions.json index 5827767a9d..ac04ed610e 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -12,8 +12,10 @@ "base-url|public-checksums|preview|main": "https://ci.dot.net/public-checksums", "base-url|public-checksums|preview|nightly": "https://ci.dot.net/public-checksums", - "azurelinux|3.0|repo": "mcr.microsoft.com/azurelinux", - "azurelinux|4.0|repo": "mcr.microsoft.com/azurelinux-beta", + "azurelinux|3.0|core": "mcr.microsoft.com/azurelinux/base/core:3.0", + "azurelinux|3.0|distroless-minimal": "mcr.microsoft.com/azurelinux/distroless/minimal:3.0", + "azurelinux|4.0|core": "mcr.microsoft.com/azurelinux/core:4", + "azurelinux|4.0|distroless-minimal": "mcr.microsoft.com/azurelinux/core:4-distroless-minimal", "alpine|floating-tag-version": "alpine3.24", "alpine|11.0|floating-tag-version": "alpine3.24", diff --git a/src/aspnet/11.0/azurelinux4.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux4.0-distroless-composite-extra/amd64/Dockerfile index a4ee0f2e03..255f766eb9 100644 --- a/src/aspnet/11.0/azurelinux4.0-distroless-composite-extra/amd64/Dockerfile +++ b/src/aspnet/11.0/azurelinux4.0-distroless-composite-extra/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/aspnet/11.0/azurelinux4.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux4.0-distroless-composite-extra/arm64v8/Dockerfile index 260a315a54..7a5c045c66 100644 --- a/src/aspnet/11.0/azurelinux4.0-distroless-composite-extra/arm64v8/Dockerfile +++ b/src/aspnet/11.0/azurelinux4.0-distroless-composite-extra/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/aspnet/11.0/azurelinux4.0-distroless-composite/amd64/Dockerfile b/src/aspnet/11.0/azurelinux4.0-distroless-composite/amd64/Dockerfile index 9498146e3e..293a2cbc69 100644 --- a/src/aspnet/11.0/azurelinux4.0-distroless-composite/amd64/Dockerfile +++ b/src/aspnet/11.0/azurelinux4.0-distroless-composite/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/aspnet/11.0/azurelinux4.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux4.0-distroless-composite/arm64v8/Dockerfile index a9e7aca27f..7816cf81fb 100644 --- a/src/aspnet/11.0/azurelinux4.0-distroless-composite/arm64v8/Dockerfile +++ b/src/aspnet/11.0/azurelinux4.0-distroless-composite/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/aspnet/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile index 5c3cbad866..638d72220c 100644 --- a/src/aspnet/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile +++ b/src/aspnet/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/aspnet/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile index 131b28542b..1d4153702c 100644 --- a/src/aspnet/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile +++ b/src/aspnet/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/aspnet/11.0/azurelinux4.0-distroless/amd64/Dockerfile b/src/aspnet/11.0/azurelinux4.0-distroless/amd64/Dockerfile index df5b2bca64..47ccec6b89 100644 --- a/src/aspnet/11.0/azurelinux4.0-distroless/amd64/Dockerfile +++ b/src/aspnet/11.0/azurelinux4.0-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/aspnet/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile index dbe648230c..14134a6621 100644 --- a/src/aspnet/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile +++ b/src/aspnet/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/runtime-deps/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile b/src/runtime-deps/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile index 5ff1782f12..be6c2545ec 100644 --- a/src/runtime-deps/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile +++ b/src/runtime-deps/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ shadow-utils \ @@ -48,7 +48,7 @@ RUN \ # .NET runtime-deps image -FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0 +FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile index 5ff1782f12..be6c2545ec 100644 --- a/src/runtime-deps/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ shadow-utils \ @@ -48,7 +48,7 @@ RUN \ # .NET runtime-deps image -FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0 +FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/11.0/azurelinux4.0-distroless/amd64/Dockerfile b/src/runtime-deps/11.0/azurelinux4.0-distroless/amd64/Dockerfile index f275abacce..9fea852eff 100644 --- a/src/runtime-deps/11.0/azurelinux4.0-distroless/amd64/Dockerfile +++ b/src/runtime-deps/11.0/azurelinux4.0-distroless/amd64/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ shadow-utils \ @@ -46,7 +46,7 @@ RUN \ # .NET runtime-deps image -FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0 +FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile b/src/runtime-deps/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile index f275abacce..9fea852eff 100644 --- a/src/runtime-deps/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile @@ -1,5 +1,5 @@ # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ shadow-utils \ @@ -46,7 +46,7 @@ RUN \ # .NET runtime-deps image -FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0 +FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/11.0/azurelinux4.0/amd64/Dockerfile b/src/runtime-deps/11.0/azurelinux4.0/amd64/Dockerfile index 303a068fe7..85067aa6ee 100644 --- a/src/runtime-deps/11.0/azurelinux4.0/amd64/Dockerfile +++ b/src/runtime-deps/11.0/azurelinux4.0/amd64/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 +FROM mcr.microsoft.com/azurelinux/core:4 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime-deps/11.0/azurelinux4.0/arm64v8/Dockerfile b/src/runtime-deps/11.0/azurelinux4.0/arm64v8/Dockerfile index 303a068fe7..85067aa6ee 100644 --- a/src/runtime-deps/11.0/azurelinux4.0/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/azurelinux4.0/arm64v8/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 +FROM mcr.microsoft.com/azurelinux/core:4 ENV \ # UID of the non-root user 'app' diff --git a/src/runtime/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile b/src/runtime/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile index 9c7ad8a069..c28cc36ac7 100644 --- a/src/runtime/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile +++ b/src/runtime/11.0/azurelinux4.0-distroless-extra/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/runtime/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile index 239d095ee8..40ba5dcf9c 100644 --- a/src/runtime/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile +++ b/src/runtime/11.0/azurelinux4.0-distroless-extra/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/runtime/11.0/azurelinux4.0-distroless/amd64/Dockerfile b/src/runtime/11.0/azurelinux4.0-distroless/amd64/Dockerfile index c833742865..bb8b84ed01 100644 --- a/src/runtime/11.0/azurelinux4.0-distroless/amd64/Dockerfile +++ b/src/runtime/11.0/azurelinux4.0-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/src/runtime/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile index 5bdfcb1179..1c7640ed3e 100644 --- a/src/runtime/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile +++ b/src/runtime/11.0/azurelinux4.0-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt index 1a716538af..741a9a1266 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt index 7b8682d546..c01f2b5433 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-amd64-Dockerfile.approved.txt index ff6d548ee2..3b9b4874e2 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-amd64-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-arm64v8-Dockerfile.approved.txt index 18331f405b..a1f6bf0691 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-arm64v8-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-extra-amd64-Dockerfile.approved.txt index 9ba1c8620c..c0be758a09 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-extra-amd64-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt index 7d42b2551d..b0311bcd9d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt index 3e25da8f38..82b042fe8a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt index 77805de83a..47b30eb5c0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt index c09cfa7357..f5cf79f6d4 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt index bdcfb9fe02..62244d9cbc 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt index c6753cf27b..6d00e03a64 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt index c7de2b3a49..9cecd85c92 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ ca-certificates \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt index 303a068fe7..85067aa6ee 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 +FROM mcr.microsoft.com/azurelinux/core:4 ENV \ # UID of the non-root user 'app' diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt index 303a068fe7..85067aa6ee 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 +FROM mcr.microsoft.com/azurelinux/core:4 ENV \ # UID of the non-root user 'app' diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt index f275abacce..9fea852eff 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-amd64-Dockerfile.approved.txt @@ -1,5 +1,5 @@ # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ shadow-utils \ @@ -46,7 +46,7 @@ RUN \ # .NET runtime-deps image -FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0 +FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal ENV \ # UID of the non-root user 'app' diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt index f275abacce..9fea852eff 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-arm64v8-Dockerfile.approved.txt @@ -1,5 +1,5 @@ # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ shadow-utils \ @@ -46,7 +46,7 @@ RUN \ # .NET runtime-deps image -FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0 +FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal ENV \ # UID of the non-root user 'app' diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt index 5ff1782f12..be6c2545ec 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-extra-amd64-Dockerfile.approved.txt @@ -1,5 +1,5 @@ # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ shadow-utils \ @@ -48,7 +48,7 @@ RUN \ # .NET runtime-deps image -FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0 +FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal ENV \ # UID of the non-root user 'app' diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt index 5ff1782f12..be6c2545ec 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-azurelinux4.0-distroless-extra-arm64v8-Dockerfile.approved.txt @@ -1,5 +1,5 @@ # Installer image -FROM mcr.microsoft.com/azurelinux-beta/base/core:4.0 AS installer +FROM mcr.microsoft.com/azurelinux/core:4 AS installer RUN dnf install -y \ shadow-utils \ @@ -48,7 +48,7 @@ RUN \ # .NET runtime-deps image -FROM mcr.microsoft.com/azurelinux-beta/distroless/minimal:4.0 +FROM mcr.microsoft.com/azurelinux/core:4-distroless-minimal ENV \ # UID of the non-root user 'app' diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs index 2c9ab0dd1b..1d4b06543b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs @@ -124,13 +124,6 @@ protected void VerifyCommonDefaultUser(ProductImageData imageData) { expectedUser = "ContainerUser"; } - // Azure Linux 4.0 and newer base images default to USER root, unlike 3.0 - // which left the user unset. Our non-distroless images inherit this from - // the base image without resetting it. - else if (imageData.OS.Family == OSFamily.AzureLinux && imageData.OS.Version != "3.0") - { - expectedUser = "root"; - } else { expectedUser = string.Empty;