From a404497c0362b99d7ee703709446382cd59a88bf Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 24 Mar 2026 14:38:05 -0700 Subject: [PATCH] Manually update zlib in Alpine 3.23 base image --- eng/dockerfile-templates/Dockerfile.linux.install-deps | 4 +++- src/runtime-deps/10.0/alpine3.23-extra/amd64/Dockerfile | 5 ++++- src/runtime-deps/10.0/alpine3.23-extra/arm32v7/Dockerfile | 5 ++++- src/runtime-deps/10.0/alpine3.23-extra/arm64v8/Dockerfile | 5 ++++- src/runtime-deps/10.0/alpine3.23/amd64/Dockerfile | 5 ++++- src/runtime-deps/10.0/alpine3.23/arm32v7/Dockerfile | 5 ++++- src/runtime-deps/10.0/alpine3.23/arm64v8/Dockerfile | 5 ++++- src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile | 5 ++++- src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile | 5 ++++- src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile | 5 ++++- src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile | 5 ++++- src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile | 5 ++++- src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile | 5 ++++- src/runtime-deps/9.0/alpine3.23-extra/amd64/Dockerfile | 5 ++++- src/runtime-deps/9.0/alpine3.23-extra/arm32v7/Dockerfile | 5 ++++- src/runtime-deps/9.0/alpine3.23-extra/arm64v8/Dockerfile | 5 ++++- src/runtime-deps/9.0/alpine3.23/amd64/Dockerfile | 5 ++++- src/runtime-deps/9.0/alpine3.23/arm32v7/Dockerfile | 5 ++++- src/runtime-deps/9.0/alpine3.23/arm64v8/Dockerfile | 5 ++++- ...untime-deps-10.0-alpine3.23-amd64-Dockerfile.approved.txt | 5 ++++- ...time-deps-10.0-alpine3.23-arm32v7-Dockerfile.approved.txt | 5 ++++- ...time-deps-10.0-alpine3.23-arm64v8-Dockerfile.approved.txt | 5 ++++- ...-deps-10.0-alpine3.23-extra-amd64-Dockerfile.approved.txt | 5 ++++- ...eps-10.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt | 5 ++++- ...eps-10.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt | 5 ++++- ...untime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt | 5 ++++- ...time-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt | 5 ++++- ...time-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt | 5 ++++- ...-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt | 5 ++++- ...eps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt | 5 ++++- ...eps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt | 5 ++++- ...runtime-deps-9.0-alpine3.23-amd64-Dockerfile.approved.txt | 5 ++++- ...ntime-deps-9.0-alpine3.23-arm32v7-Dockerfile.approved.txt | 5 ++++- ...ntime-deps-9.0-alpine3.23-arm64v8-Dockerfile.approved.txt | 5 ++++- ...e-deps-9.0-alpine3.23-extra-amd64-Dockerfile.approved.txt | 5 ++++- ...deps-9.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt | 5 ++++- ...deps-9.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt | 5 ++++- 37 files changed, 147 insertions(+), 37 deletions(-) diff --git a/eng/dockerfile-templates/Dockerfile.linux.install-deps b/eng/dockerfile-templates/Dockerfile.linux.install-deps index fcc0d6ba2f..c2e462960a 100644 --- a/eng/dockerfile-templates/Dockerfile.linux.install-deps +++ b/eng/dockerfile-templates/Dockerfile.linux.install-deps @@ -85,7 +85,9 @@ dotnetDepsComment ] ^ - set pkgs to cat(prefixPkgs, pkgs) ^ + set suffixPkgs to when(isAlpine && dotnetVersion != "8.0", ["", "# manually update zlib from alpine base image", zlibPkg], []) ^ + + set pkgs to cat(prefixPkgs, pkgs, suffixPkgs) ^ set pkgMgrOpts to when(len(ARGS["staging-dir"]) > 0, cat(" --installroot ", ARGS["staging-dir"]), diff --git a/src/runtime-deps/10.0/alpine3.23-extra/amd64/Dockerfile b/src/runtime-deps/10.0/alpine3.23-extra/amd64/Dockerfile index e4e8a49348..c1c2d27ef7 100644 --- a/src/runtime-deps/10.0/alpine3.23-extra/amd64/Dockerfile +++ b/src/runtime-deps/10.0/alpine3.23-extra/amd64/Dockerfile @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/10.0/alpine3.23-extra/arm32v7/Dockerfile b/src/runtime-deps/10.0/alpine3.23-extra/arm32v7/Dockerfile index 459793f172..3a06263815 100644 --- a/src/runtime-deps/10.0/alpine3.23-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/alpine3.23-extra/arm32v7/Dockerfile @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/10.0/alpine3.23-extra/arm64v8/Dockerfile b/src/runtime-deps/10.0/alpine3.23-extra/arm64v8/Dockerfile index cdbd11bda4..b3f0e62189 100644 --- a/src/runtime-deps/10.0/alpine3.23-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/alpine3.23-extra/arm64v8/Dockerfile @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/10.0/alpine3.23/amd64/Dockerfile b/src/runtime-deps/10.0/alpine3.23/amd64/Dockerfile index 3584d9343b..f7db4b33db 100644 --- a/src/runtime-deps/10.0/alpine3.23/amd64/Dockerfile +++ b/src/runtime-deps/10.0/alpine3.23/amd64/Dockerfile @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/10.0/alpine3.23/arm32v7/Dockerfile b/src/runtime-deps/10.0/alpine3.23/arm32v7/Dockerfile index 44fac11e41..64d2dcfee0 100644 --- a/src/runtime-deps/10.0/alpine3.23/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/alpine3.23/arm32v7/Dockerfile @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/10.0/alpine3.23/arm64v8/Dockerfile b/src/runtime-deps/10.0/alpine3.23/arm64v8/Dockerfile index 682d8bd495..f82fbc936d 100644 --- a/src/runtime-deps/10.0/alpine3.23/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/alpine3.23/arm64v8/Dockerfile @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile index e4e8a49348..c1c2d27ef7 100644 --- a/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile +++ b/src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile index 459793f172..3a06263815 100644 --- a/src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile index cdbd11bda4..b3f0e62189 100644 --- a/src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile b/src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile index 3584d9343b..f7db4b33db 100644 --- a/src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile +++ b/src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile b/src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile index 44fac11e41..64d2dcfee0 100644 --- a/src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile +++ b/src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile b/src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile index 682d8bd495..f82fbc936d 100644 --- a/src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/9.0/alpine3.23-extra/amd64/Dockerfile b/src/runtime-deps/9.0/alpine3.23-extra/amd64/Dockerfile index e4e8a49348..c1c2d27ef7 100644 --- a/src/runtime-deps/9.0/alpine3.23-extra/amd64/Dockerfile +++ b/src/runtime-deps/9.0/alpine3.23-extra/amd64/Dockerfile @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/9.0/alpine3.23-extra/arm32v7/Dockerfile b/src/runtime-deps/9.0/alpine3.23-extra/arm32v7/Dockerfile index 459793f172..3a06263815 100644 --- a/src/runtime-deps/9.0/alpine3.23-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/alpine3.23-extra/arm32v7/Dockerfile @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/9.0/alpine3.23-extra/arm64v8/Dockerfile b/src/runtime-deps/9.0/alpine3.23-extra/arm64v8/Dockerfile index cdbd11bda4..b3f0e62189 100644 --- a/src/runtime-deps/9.0/alpine3.23-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/alpine3.23-extra/arm64v8/Dockerfile @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/9.0/alpine3.23/amd64/Dockerfile b/src/runtime-deps/9.0/alpine3.23/amd64/Dockerfile index 3584d9343b..f7db4b33db 100644 --- a/src/runtime-deps/9.0/alpine3.23/amd64/Dockerfile +++ b/src/runtime-deps/9.0/alpine3.23/amd64/Dockerfile @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/9.0/alpine3.23/arm32v7/Dockerfile b/src/runtime-deps/9.0/alpine3.23/arm32v7/Dockerfile index 44fac11e41..64d2dcfee0 100644 --- a/src/runtime-deps/9.0/alpine3.23/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/alpine3.23/arm32v7/Dockerfile @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/src/runtime-deps/9.0/alpine3.23/arm64v8/Dockerfile b/src/runtime-deps/9.0/alpine3.23/arm64v8/Dockerfile index 682d8bd495..f82fbc936d 100644 --- a/src/runtime-deps/9.0/alpine3.23/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/alpine3.23/arm64v8/Dockerfile @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-amd64-Dockerfile.approved.txt index 3584d9343b..f7db4b33db 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-arm32v7-Dockerfile.approved.txt index 44fac11e41..64d2dcfee0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-arm32v7-Dockerfile.approved.txt @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-arm64v8-Dockerfile.approved.txt index 682d8bd495..f82fbc936d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-arm64v8-Dockerfile.approved.txt @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-amd64-Dockerfile.approved.txt index e4e8a49348..c1c2d27ef7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-amd64-Dockerfile.approved.txt @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt index 459793f172..3a06263815 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt index cdbd11bda4..b3f0e62189 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-10.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt index 3584d9343b..f7db4b33db 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt index 44fac11e41..64d2dcfee0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt index 682d8bd495..f82fbc936d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt index e4e8a49348..c1c2d27ef7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt index 459793f172..3a06263815 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt index cdbd11bda4..b3f0e62189 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-amd64-Dockerfile.approved.txt index 3584d9343b..f7db4b33db 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-arm32v7-Dockerfile.approved.txt index 44fac11e41..64d2dcfee0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-arm32v7-Dockerfile.approved.txt @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-arm64v8-Dockerfile.approved.txt index 682d8bd495..f82fbc936d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-arm64v8-Dockerfile.approved.txt @@ -16,7 +16,10 @@ RUN apk add --upgrade --no-cache \ # .NET dependencies libgcc \ libssl3 \ - libstdc++ + libstdc++ \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-amd64-Dockerfile.approved.txt index e4e8a49348..c1c2d27ef7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-amd64-Dockerfile.approved.txt @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt index 459793f172..3a06263815 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt index cdbd11bda4..b3f0e62189 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt @@ -17,7 +17,10 @@ RUN apk add --upgrade --no-cache \ libgcc \ libssl3 \ libstdc++ \ - tzdata + tzdata \ + \ + # manually update zlib from alpine base image + zlib # Create a non-root user and group RUN addgroup \