From ddbf9a6d0266e1507b71fcc4b982924b1ba02f52 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 28 Apr 2025 17:56:04 -0700 Subject: [PATCH 1/7] Add Trixie to manifest --- manifest.json | 398 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 398 insertions(+) diff --git a/manifest.json b/manifest.json index 43b44aa71b..a67ecd84e7 100644 --- a/manifest.json +++ b/manifest.json @@ -78,6 +78,49 @@ } ] }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim": {} + }, + "platforms": [ + { + "dockerfile": "src/runtime-deps/8.0/trixie-slim/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim-amd64": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim-amd64": {} + } + }, + { + "architecture": "arm", + "dockerfile": "src/runtime-deps/8.0/trixie-slim/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim-arm32v7": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim-arm32v7": {} + }, + "variant": "v7" + }, + { + "architecture": "arm64", + "dockerfile": "src/runtime-deps/8.0/trixie-slim/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim-arm64v8": {} + }, + "variant": "v8" + } + ] + }, { "productVersion": "$(dotnet|8.0|product-version)", "sharedTags": { @@ -992,6 +1035,49 @@ } ] }, + { + "productVersion": "$(dotnet|9.0|product-version)", + "sharedTags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim": {} + }, + "platforms": [ + { + "dockerfile": "src/runtime-deps/9.0/trixie-slim/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim-amd64": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim-amd64": {} + } + }, + { + "architecture": "arm", + "dockerfile": "src/runtime-deps/9.0/trixie-slim/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim-arm32v7": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim-arm32v7": {} + }, + "variant": "v7" + }, + { + "architecture": "arm64", + "dockerfile": "src/runtime-deps/9.0/trixie-slim/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim-arm64v8": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim-arm64v8": {} + }, + "variant": "v8" + } + ] + }, { "productVersion": "$(dotnet|9.0|product-version)", "sharedTags": { @@ -2085,6 +2171,58 @@ } ] }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/trixie-slim/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim-amd64": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim-amd64": {} + } + }, + { + "architecture": "arm", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/trixie-slim/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim-arm32v7": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim-arm32v7": {} + }, + "variant": "v7" + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/trixie-slim/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim-arm64v8": {} + }, + "variant": "v8" + } + ] + }, { "productVersion": "$(dotnet|8.0|product-version)", "sharedTags": { @@ -2989,6 +3127,58 @@ } ] }, + { + "productVersion": "$(dotnet|9.0|product-version)", + "sharedTags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/9.0/trixie-slim/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim-amd64": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim-amd64": {} + } + }, + { + "architecture": "arm", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/9.0/trixie-slim/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim-arm32v7": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim-arm32v7": {} + }, + "variant": "v7" + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/9.0/trixie-slim/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim-arm64v8": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim-arm64v8": {} + }, + "variant": "v8" + } + ] + }, { "productVersion": "$(dotnet|9.0|product-version)", "sharedTags": { @@ -4195,6 +4385,58 @@ } ] }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/trixie-slim/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim-amd64": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim-amd64": {} + } + }, + { + "architecture": "arm", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/trixie-slim/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim-arm32v7": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim-arm32v7": {} + }, + "variant": "v7" + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/trixie-slim/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|8.0|fixed-tag)-trixie-slim-arm64v8": {}, + "$(dotnet|8.0|minor-tag)-trixie-slim-arm64v8": {} + }, + "variant": "v8" + } + ] + }, { "productVersion": "$(dotnet|8.0|product-version)", "sharedTags": { @@ -5589,6 +5831,58 @@ } ] }, + { + "productVersion": "$(dotnet|9.0|product-version)", + "sharedTags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/9.0/trixie-slim/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim-amd64": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim-amd64": {} + } + }, + { + "architecture": "arm", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/9.0/trixie-slim/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim-arm32v7": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim-arm32v7": {} + }, + "variant": "v7" + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/9.0/trixie-slim/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(dotnet|9.0|fixed-tag)-trixie-slim-arm64v8": {}, + "$(dotnet|9.0|minor-tag)-trixie-slim-arm64v8": {} + }, + "variant": "v8" + } + ] + }, { "productVersion": "$(dotnet|9.0|product-version)", "sharedTags": { @@ -7455,6 +7749,58 @@ } ] }, + { + "productVersion": "$(sdk|8.0|product-version)", + "sharedTags": { + "$(sdk|8.0|fixed-tag)-trixie-slim": {}, + "$(sdk|8.0|minor-tag)-trixie-slim": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:aspnet)" + }, + "dockerfile": "src/sdk/8.0/trixie-slim/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(sdk|8.0|fixed-tag)-trixie-slim-amd64": {}, + "$(sdk|8.0|minor-tag)-trixie-slim-amd64": {} + } + }, + { + "buildArgs": { + "REPO": "$(Repo:aspnet)" + }, + "architecture": "arm", + "dockerfile": "src/sdk/8.0/trixie-slim/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(sdk|8.0|fixed-tag)-trixie-slim-arm32v7": {}, + "$(sdk|8.0|minor-tag)-trixie-slim-arm32v7": {} + }, + "variant": "v7" + }, + { + "buildArgs": { + "REPO": "$(Repo:aspnet)" + }, + "architecture": "arm64", + "dockerfile": "src/sdk/8.0/trixie-slim/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(sdk|8.0|fixed-tag)-trixie-slim-arm64v8": {}, + "$(sdk|8.0|minor-tag)-trixie-slim-arm64v8": {} + }, + "variant": "v8" + } + ] + }, { "productVersion": "$(sdk|8.0|product-version)", "sharedTags": { @@ -7845,6 +8191,58 @@ } ] }, + { + "productVersion": "$(sdk|9.0|product-version)", + "sharedTags": { + "$(sdk|9.0|fixed-tag)-trixie-slim": {}, + "$(sdk|9.0|minor-tag)-trixie-slim": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:aspnet)" + }, + "dockerfile": "src/sdk/9.0/trixie-slim/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(sdk|9.0|fixed-tag)-trixie-slim-amd64": {}, + "$(sdk|9.0|minor-tag)-trixie-slim-amd64": {} + } + }, + { + "buildArgs": { + "REPO": "$(Repo:aspnet)" + }, + "architecture": "arm", + "dockerfile": "src/sdk/9.0/trixie-slim/arm32v7", + "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(sdk|9.0|fixed-tag)-trixie-slim-arm32v7": {}, + "$(sdk|9.0|minor-tag)-trixie-slim-arm32v7": {} + }, + "variant": "v7" + }, + { + "buildArgs": { + "REPO": "$(Repo:aspnet)" + }, + "architecture": "arm64", + "dockerfile": "src/sdk/9.0/trixie-slim/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux", + "os": "linux", + "osVersion": "trixie-slim", + "tags": { + "$(sdk|9.0|fixed-tag)-trixie-slim-arm64v8": {}, + "$(sdk|9.0|minor-tag)-trixie-slim-arm64v8": {} + }, + "variant": "v8" + } + ] + }, { "productVersion": "$(sdk|9.0|product-version)", "sharedTags": { From 9b23ad27053f12997cd07d9ea2bf9481c6bea9f1 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 28 Apr 2025 18:08:26 -0700 Subject: [PATCH 2/7] Add Dockerfiles --- src/aspnet/8.0/trixie-slim/amd64/Dockerfile | 22 ++++++++ src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile | 22 ++++++++ src/aspnet/8.0/trixie-slim/arm64v8/Dockerfile | 22 ++++++++ src/aspnet/9.0/trixie-slim/amd64/Dockerfile | 22 ++++++++ src/aspnet/9.0/trixie-slim/arm32v7/Dockerfile | 22 ++++++++ src/aspnet/9.0/trixie-slim/arm64v8/Dockerfile | 22 ++++++++ .../8.0/trixie-slim/amd64/Dockerfile | 33 +++++++++++ .../8.0/trixie-slim/arm32v7/Dockerfile | 33 +++++++++++ .../8.0/trixie-slim/arm64v8/Dockerfile | 33 +++++++++++ .../9.0/trixie-slim/amd64/Dockerfile | 32 +++++++++++ .../9.0/trixie-slim/arm32v7/Dockerfile | 32 +++++++++++ .../9.0/trixie-slim/arm64v8/Dockerfile | 32 +++++++++++ src/runtime/8.0/trixie-slim/amd64/Dockerfile | 24 ++++++++ .../8.0/trixie-slim/arm32v7/Dockerfile | 24 ++++++++ .../8.0/trixie-slim/arm64v8/Dockerfile | 24 ++++++++ src/runtime/9.0/trixie-slim/amd64/Dockerfile | 24 ++++++++ .../9.0/trixie-slim/arm32v7/Dockerfile | 24 ++++++++ .../9.0/trixie-slim/arm64v8/Dockerfile | 24 ++++++++ src/sdk/8.0/trixie-slim/amd64/Dockerfile | 56 +++++++++++++++++++ src/sdk/8.0/trixie-slim/arm32v7/Dockerfile | 56 +++++++++++++++++++ src/sdk/8.0/trixie-slim/arm64v8/Dockerfile | 56 +++++++++++++++++++ src/sdk/9.0/trixie-slim/amd64/Dockerfile | 56 +++++++++++++++++++ src/sdk/9.0/trixie-slim/arm32v7/Dockerfile | 56 +++++++++++++++++++ src/sdk/9.0/trixie-slim/arm64v8/Dockerfile | 56 +++++++++++++++++++ 24 files changed, 807 insertions(+) create mode 100644 src/aspnet/8.0/trixie-slim/amd64/Dockerfile create mode 100644 src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile create mode 100644 src/aspnet/8.0/trixie-slim/arm64v8/Dockerfile create mode 100644 src/aspnet/9.0/trixie-slim/amd64/Dockerfile create mode 100644 src/aspnet/9.0/trixie-slim/arm32v7/Dockerfile create mode 100644 src/aspnet/9.0/trixie-slim/arm64v8/Dockerfile create mode 100644 src/runtime-deps/8.0/trixie-slim/amd64/Dockerfile create mode 100644 src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile create mode 100644 src/runtime-deps/8.0/trixie-slim/arm64v8/Dockerfile create mode 100644 src/runtime-deps/9.0/trixie-slim/amd64/Dockerfile create mode 100644 src/runtime-deps/9.0/trixie-slim/arm32v7/Dockerfile create mode 100644 src/runtime-deps/9.0/trixie-slim/arm64v8/Dockerfile create mode 100644 src/runtime/8.0/trixie-slim/amd64/Dockerfile create mode 100644 src/runtime/8.0/trixie-slim/arm32v7/Dockerfile create mode 100644 src/runtime/8.0/trixie-slim/arm64v8/Dockerfile create mode 100644 src/runtime/9.0/trixie-slim/amd64/Dockerfile create mode 100644 src/runtime/9.0/trixie-slim/arm32v7/Dockerfile create mode 100644 src/runtime/9.0/trixie-slim/arm64v8/Dockerfile create mode 100644 src/sdk/8.0/trixie-slim/amd64/Dockerfile create mode 100644 src/sdk/8.0/trixie-slim/arm32v7/Dockerfile create mode 100644 src/sdk/8.0/trixie-slim/arm64v8/Dockerfile create mode 100644 src/sdk/9.0/trixie-slim/amd64/Dockerfile create mode 100644 src/sdk/9.0/trixie-slim/arm32v7/Dockerfile create mode 100644 src/sdk/9.0/trixie-slim/arm64v8/Dockerfile diff --git a/src/aspnet/8.0/trixie-slim/amd64/Dockerfile b/src/aspnet/8.0/trixie-slim/amd64/Dockerfile new file mode 100644 index 0000000000..b24b9fa4b8 --- /dev/null +++ b/src/aspnet/8.0/trixie-slim/amd64/Dockerfile @@ -0,0 +1,22 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.15 \ + && curl -fSL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + && aspnetcore_sha512='3ca5669d4aff60f1bf8cecb99de05d6b489db150caa7c184d1a8bcdf085c611533e05ad7bd0c5091c726850611cff6b0477ef9b1dbb192ebe9055c03de1cf6d8' \ + && 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.15-trixie-slim-amd64 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.15 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile b/src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile new file mode 100644 index 0000000000..eff1eb93c4 --- /dev/null +++ b/src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile @@ -0,0 +1,22 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.15 \ + && curl -fSL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + && aspnetcore_sha512='0995e596c1fd02f5e89a7f695b93976af253841ef30fe83a05310a3fcf4e069692c5620e80355dcd3fe6ae32e7b5adbae0bb3f0ff35e334c2f28f14c44dca6ef' \ + && 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.15-trixie-slim-arm32v7 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.15 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/8.0/trixie-slim/arm64v8/Dockerfile b/src/aspnet/8.0/trixie-slim/arm64v8/Dockerfile new file mode 100644 index 0000000000..437834d769 --- /dev/null +++ b/src/aspnet/8.0/trixie-slim/arm64v8/Dockerfile @@ -0,0 +1,22 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.15 \ + && curl -fSL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + && aspnetcore_sha512='967d43a9387d226ed804cfee35144a69f249f6206b73ed0d8915dad358fede3c5ddc3ec963a5c35400b62dc57265da1dbc07d793cf5e3940ce94e54783312f0e' \ + && 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.15-trixie-slim-arm64v8 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.15 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/9.0/trixie-slim/amd64/Dockerfile b/src/aspnet/9.0/trixie-slim/amd64/Dockerfile new file mode 100644 index 0000000000..1b66f6f651 --- /dev/null +++ b/src/aspnet/9.0/trixie-slim/amd64/Dockerfile @@ -0,0 +1,22 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +# Retrieve ASP.NET Core +RUN aspnetcore_version=9.0.4 \ + && curl -fSL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + && aspnetcore_sha512='f3eae8863634a050b90b672b14d466a44c623ca06c6501a3a70efea93e540995e2fa348ae5ef7a3f278110a9ba24043a651150a378e4e5a84c25690b73364132' \ + && 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:9.0.4-trixie-slim-amd64 + +# ASP.NET Core version +ENV ASPNET_VERSION=9.0.4 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/9.0/trixie-slim/arm32v7/Dockerfile b/src/aspnet/9.0/trixie-slim/arm32v7/Dockerfile new file mode 100644 index 0000000000..7f99a5d99b --- /dev/null +++ b/src/aspnet/9.0/trixie-slim/arm32v7/Dockerfile @@ -0,0 +1,22 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +# Retrieve ASP.NET Core +RUN aspnetcore_version=9.0.4 \ + && curl -fSL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ + && aspnetcore_sha512='6b3c1c5af12fb09910967d6485603d04c8a3c47a9e6bb11c7375a5ae1b76175b013afb4923cadd99a7a22b782ca4b8b824070bf5252c5481324ac023fe72cea4' \ + && 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:9.0.4-trixie-slim-arm32v7 + +# ASP.NET Core version +ENV ASPNET_VERSION=9.0.4 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/9.0/trixie-slim/arm64v8/Dockerfile b/src/aspnet/9.0/trixie-slim/arm64v8/Dockerfile new file mode 100644 index 0000000000..54f95d01a0 --- /dev/null +++ b/src/aspnet/9.0/trixie-slim/arm64v8/Dockerfile @@ -0,0 +1,22 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +# Retrieve ASP.NET Core +RUN aspnetcore_version=9.0.4 \ + && curl -fSL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + && aspnetcore_sha512='7cca4084341c2e978e6d75e09cae308a35de7cd84c5b27d5246b9d1b3e6aaff200bae8de5a25b816e30c3ba354bef17b84bae0ce15144895518661e53af18331' \ + && 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:9.0.4-trixie-slim-arm64v8 + +# ASP.NET Core version +ENV ASPNET_VERSION=9.0.4 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime-deps/8.0/trixie-slim/amd64/Dockerfile b/src/runtime-deps/8.0/trixie-slim/amd64/Dockerfile new file mode 100644 index 0000000000..042e67dcd2 --- /dev/null +++ b/src/runtime-deps/8.0/trixie-slim/amd64/Dockerfile @@ -0,0 +1,33 @@ +FROM amd64/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile b/src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile new file mode 100644 index 0000000000..09647b280e --- /dev/null +++ b/src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile @@ -0,0 +1,33 @@ +FROM arm32v7/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/src/runtime-deps/8.0/trixie-slim/arm64v8/Dockerfile b/src/runtime-deps/8.0/trixie-slim/arm64v8/Dockerfile new file mode 100644 index 0000000000..a51b839100 --- /dev/null +++ b/src/runtime-deps/8.0/trixie-slim/arm64v8/Dockerfile @@ -0,0 +1,33 @@ +FROM arm64v8/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/src/runtime-deps/9.0/trixie-slim/amd64/Dockerfile b/src/runtime-deps/9.0/trixie-slim/amd64/Dockerfile new file mode 100644 index 0000000000..2a52f07951 --- /dev/null +++ b/src/runtime-deps/9.0/trixie-slim/amd64/Dockerfile @@ -0,0 +1,32 @@ +FROM amd64/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/src/runtime-deps/9.0/trixie-slim/arm32v7/Dockerfile b/src/runtime-deps/9.0/trixie-slim/arm32v7/Dockerfile new file mode 100644 index 0000000000..3c0429fc2f --- /dev/null +++ b/src/runtime-deps/9.0/trixie-slim/arm32v7/Dockerfile @@ -0,0 +1,32 @@ +FROM arm32v7/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/src/runtime-deps/9.0/trixie-slim/arm64v8/Dockerfile b/src/runtime-deps/9.0/trixie-slim/arm64v8/Dockerfile new file mode 100644 index 0000000000..f7252b4448 --- /dev/null +++ b/src/runtime-deps/9.0/trixie-slim/arm64v8/Dockerfile @@ -0,0 +1,32 @@ +FROM arm64v8/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/src/runtime/8.0/trixie-slim/amd64/Dockerfile b/src/runtime/8.0/trixie-slim/amd64/Dockerfile new file mode 100644 index 0000000000..49e1647fad --- /dev/null +++ b/src/runtime/8.0/trixie-slim/amd64/Dockerfile @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.15 \ + && curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + && dotnet_sha512='833a848541ba6f71c8792168914856e16de6f71cf0a481c5990f3622b0e3f83123e6024bcabf6b955a7c92e8e904181d40d3bd612595a0d8c47a421267a91ca6' \ + && 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.15-trixie-slim-amd64 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.15 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/runtime/8.0/trixie-slim/arm32v7/Dockerfile b/src/runtime/8.0/trixie-slim/arm32v7/Dockerfile new file mode 100644 index 0000000000..27d5259733 --- /dev/null +++ b/src/runtime/8.0/trixie-slim/arm32v7/Dockerfile @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.15 \ + && curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + && dotnet_sha512='2b6f4f7285f9cdc39ef48464081e9962a1f0abcd468c84e88a4d10a7e175d30ff1f3b58c48a483958f97e1a33a5c8a223510313066b5a6e5b35d0dead86ddefa' \ + && 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.15-trixie-slim-arm32v7 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.15 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/runtime/8.0/trixie-slim/arm64v8/Dockerfile b/src/runtime/8.0/trixie-slim/arm64v8/Dockerfile new file mode 100644 index 0000000000..b6b3533b4e --- /dev/null +++ b/src/runtime/8.0/trixie-slim/arm64v8/Dockerfile @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.15 \ + && curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + && dotnet_sha512='f63359a5da4798f8fdfbf0beefd0aa9cd69d5953b2629bc1c68ecc67083572fa9370a89c18e3b4bdc23671df657da756ec6306951f5cadf20062a8bd77ea400c' \ + && 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.15-trixie-slim-arm64v8 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.15 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/runtime/9.0/trixie-slim/amd64/Dockerfile b/src/runtime/9.0/trixie-slim/amd64/Dockerfile new file mode 100644 index 0000000000..f91894a234 --- /dev/null +++ b/src/runtime/9.0/trixie-slim/amd64/Dockerfile @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +# Retrieve .NET Runtime +RUN dotnet_version=9.0.4 \ + && curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + && dotnet_sha512='fb421fdd87ac2b4143b5746a049f802d11430b770422bf60310ee4e8e2e6a2c943ff8870d4ddf689c6e0f05bf5947fd4b9dfeb56783e796bb4f4f0191a5abb2c' \ + && 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:9.0.4-trixie-slim-amd64 + +# .NET Runtime version +ENV DOTNET_VERSION=9.0.4 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/runtime/9.0/trixie-slim/arm32v7/Dockerfile b/src/runtime/9.0/trixie-slim/arm32v7/Dockerfile new file mode 100644 index 0000000000..e6c0711713 --- /dev/null +++ b/src/runtime/9.0/trixie-slim/arm32v7/Dockerfile @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +# Retrieve .NET Runtime +RUN dotnet_version=9.0.4 \ + && curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ + && dotnet_sha512='aacde9722446e37c8bede60cc3d6dc14d8104ca9772cb2d7b05f3f78f2216af2ed642f97dcd4f2f11c0b7567f3402d6ae08c3260c0fb105f664b4a92a024ef18' \ + && 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:9.0.4-trixie-slim-arm32v7 + +# .NET Runtime version +ENV DOTNET_VERSION=9.0.4 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/runtime/9.0/trixie-slim/arm64v8/Dockerfile b/src/runtime/9.0/trixie-slim/arm64v8/Dockerfile new file mode 100644 index 0000000000..b859a99b4d --- /dev/null +++ b/src/runtime/9.0/trixie-slim/arm64v8/Dockerfile @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +# Retrieve .NET Runtime +RUN dotnet_version=9.0.4 \ + && curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + && dotnet_sha512='90865902fd1babc49d288efb61cd78ca63f43cfb9bbd9343f2871ff0da023f80129b3a9c26edc9583fbbf8a91932efbad3c823ad8622fe389b20b53f87254f1b' \ + && 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:9.0.4-trixie-slim-arm64v8 + +# .NET Runtime version +ENV DOTNET_VERSION=9.0.4 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/sdk/8.0/trixie-slim/amd64/Dockerfile b/src/sdk/8.0/trixie-slim/amd64/Dockerfile new file mode 100644 index 0000000000..8054a1b702 --- /dev/null +++ b/src/sdk/8.0/trixie-slim/amd64/Dockerfile @@ -0,0 +1,56 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +# Install .NET SDK +RUN curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.408/dotnet-sdk-8.0.408-linux-x64.tar.gz \ + && dotnet_sha512='a9a1e54d10a37f91e1bd9b2e9e8ce6ed31917559898e4d6d36296bd5324f67cc7a13a9106703003cbebc5a7ee50188747ba816f5d828c0cb3a4a9f9920ebac4a' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:8.0.15-trixie-slim-amd64 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=8.0.408 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=7.4.7 \ + && curl -fSL --output PowerShell.Linux.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \ + && powershell_sha512='3f4ff718b982b5cbcbc3ceef2602f681af8029e716aa00a65e60edd81c94fcea3d2e4d6c6f18b5f3cadfba2558f70dbe810397c6bf73757d132ec7bec77dfdba' \ + && echo "$powershell_sha512 PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.x64.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/src/sdk/8.0/trixie-slim/arm32v7/Dockerfile b/src/sdk/8.0/trixie-slim/arm32v7/Dockerfile new file mode 100644 index 0000000000..1fa3213f76 --- /dev/null +++ b/src/sdk/8.0/trixie-slim/arm32v7/Dockerfile @@ -0,0 +1,56 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +# Install .NET SDK +RUN curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.408/dotnet-sdk-8.0.408-linux-arm.tar.gz \ + && dotnet_sha512='9686fc37b42a322e8acaf3991f68837cfef10a41aef323286331e63123ca34a9367bf4274dd14ce019ca37345d6d868cfbfe4fbcd353f57fd3035151b97983f9' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:8.0.15-trixie-slim-arm32v7 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=8.0.408 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm32 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=7.4.7 \ + && curl -fSL --output PowerShell.Linux.arm32.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \ + && powershell_sha512='727c67c3d29e3f3216366b5e2487b14baf926ab36da58833aecb84d663e4a6f61d2c073d7a99f7b05294cea71f3d37c90bbd237cd4cad6491dd8031544c16841' \ + && echo "$powershell_sha512 PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.arm32.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/src/sdk/8.0/trixie-slim/arm64v8/Dockerfile b/src/sdk/8.0/trixie-slim/arm64v8/Dockerfile new file mode 100644 index 0000000000..bead8099b3 --- /dev/null +++ b/src/sdk/8.0/trixie-slim/arm64v8/Dockerfile @@ -0,0 +1,56 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +# Install .NET SDK +RUN curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.408/dotnet-sdk-8.0.408-linux-arm64.tar.gz \ + && dotnet_sha512='99a03d7105c14614a1a8d69673a9278315ec762096b302c7632745b3890a6d2d801df7c1f185257c9af0374ae840b942a8b60dde0eace68abec0b6962fd9213c' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:8.0.15-trixie-slim-arm64v8 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=8.0.408 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm64 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=7.4.7 \ + && curl -fSL --output PowerShell.Linux.arm64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \ + && powershell_sha512='6c72dfc5bcbac7b135e5152d0ec599e9f639255ff3be2c28eb64015e6df948b2a9c216fc2bd9b26b876a11e32182adad249b88551dd650a4342f5ac2fbed56d6' \ + && echo "$powershell_sha512 PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.arm64.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/src/sdk/9.0/trixie-slim/amd64/Dockerfile b/src/sdk/9.0/trixie-slim/amd64/Dockerfile new file mode 100644 index 0000000000..e233711d58 --- /dev/null +++ b/src/sdk/9.0/trixie-slim/amd64/Dockerfile @@ -0,0 +1,56 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +# Install .NET SDK +RUN curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.203/dotnet-sdk-9.0.203-linux-x64.tar.gz \ + && dotnet_sha512='67d62c3274aae593b61780db57f07ac85a50da82d04707fdaca66f25889a1cc01eaa95bce173247d1a9f566a92eb7ede71a7306b5af6a17ed84ee9525823ddd3' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:9.0.4-trixie-slim-amd64 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=9.0.203 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=7.5.1 \ + && curl -fSL --output PowerShell.Linux.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \ + && powershell_sha512='96e6e2b513d5974f62ec46417b62a3a94fce59ac0ef0806ad7dc40f6fd8c15f8064b2e332483e7b180d33e033015e8709eef40a8020144b0d9947f4e5fe2e1fa' \ + && echo "$powershell_sha512 PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.x64.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/src/sdk/9.0/trixie-slim/arm32v7/Dockerfile b/src/sdk/9.0/trixie-slim/arm32v7/Dockerfile new file mode 100644 index 0000000000..7e8b5176dc --- /dev/null +++ b/src/sdk/9.0/trixie-slim/arm32v7/Dockerfile @@ -0,0 +1,56 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +# Install .NET SDK +RUN curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.203/dotnet-sdk-9.0.203-linux-arm.tar.gz \ + && dotnet_sha512='7b0969a09148ac8dddf1fdcd41948f163f17acccaa68787195d2935e0e69554fef423291d60579bfb94d676aca8fd498eec49f8555fe750f0e88eadf6317eb37' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:9.0.4-trixie-slim-arm32v7 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=9.0.203 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm32 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=7.5.1 \ + && curl -fSL --output PowerShell.Linux.arm32.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \ + && powershell_sha512='d9fe78a93d3b6b4e0df66fa9c9b8fe97a1d23c7a7a64e7fca82764aa400fcb69a40c196414d1897f721622267581e7dc4c73de1087de2029267e0d85cce18dfd' \ + && echo "$powershell_sha512 PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.arm32.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/src/sdk/9.0/trixie-slim/arm64v8/Dockerfile b/src/sdk/9.0/trixie-slim/arm64v8/Dockerfile new file mode 100644 index 0000000000..6ad6a502e8 --- /dev/null +++ b/src/sdk/9.0/trixie-slim/arm64v8/Dockerfile @@ -0,0 +1,56 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +# Install .NET SDK +RUN curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.203/dotnet-sdk-9.0.203-linux-arm64.tar.gz \ + && dotnet_sha512='3070ecef0d6c550a80c3ca497598d09e9a97a264bfd72e86f7c568d2f39368bd7db837681d64d9ed187a8923915d964d02b02f5bc6a493910a18184f5321d233' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:9.0.4-trixie-slim-arm64v8 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=9.0.203 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm64 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=7.5.1 \ + && curl -fSL --output PowerShell.Linux.arm64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \ + && powershell_sha512='919f92bc7cdba754065026be2f32ea355913cba042572174ee44992be82801b9a2ed31717c039d8f7faa04095f018433fadc7541bc366a04bccfc45b228406aa' \ + && echo "$powershell_sha512 PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.arm64.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm From 1ee7f783b0e9da93f5249ecf5138cc7e106fe576 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 28 Apr 2025 18:08:34 -0700 Subject: [PATCH 3/7] Update Readmes --- README.aspnet.md | 6 ++++++ README.runtime-deps.md | 6 ++++++ README.runtime.md | 6 ++++++ README.sdk.md | 6 ++++++ eng/mcr-tags-metadata-templates/aspnet-tags.yml | 2 ++ eng/mcr-tags-metadata-templates/runtime-deps-tags.yml | 2 ++ eng/mcr-tags-metadata-templates/runtime-tags.yml | 2 ++ eng/mcr-tags-metadata-templates/sdk-tags.yml | 2 ++ 8 files changed, 32 insertions(+) diff --git a/README.aspnet.md b/README.aspnet.md index 2d273c783a..9500c48cfc 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -88,6 +88,7 @@ For more information, see the [composite images section in the Image Variants do Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.4-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.4-bookworm-slim, 9.0-bookworm-slim, 9.0.4, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +9.0.4-trixie-slim-amd64, 9.0-trixie-slim-amd64, 9.0.4-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/aspnet/9.0/trixie-slim/amd64/Dockerfile) | Debian 13 9.0.4-alpine3.21-amd64, 9.0-alpine3.21-amd64, 9.0-alpine-amd64, 9.0.4-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 9.0.4-alpine3.21-composite-amd64, 9.0-alpine3.21-composite-amd64, 9.0-alpine-composite-amd64, 9.0.4-alpine3.21-composite, 9.0-alpine3.21-composite, 9.0-alpine-composite | [Dockerfile](src/aspnet/9.0/alpine3.21-composite/amd64/Dockerfile) | Alpine 3.21 9.0.4-noble-amd64, 9.0-noble-amd64, 9.0.4-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04 @@ -101,6 +102,7 @@ Tags | Dockerfile | OS Version 9.0.4-azurelinux3.0-distroless-composite-amd64, 9.0-azurelinux3.0-distroless-composite-amd64, 9.0.4-azurelinux3.0-distroless-composite, 9.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0 9.0.4-azurelinux3.0-distroless-composite-extra-amd64, 9.0-azurelinux3.0-distroless-composite-extra-amd64, 9.0.4-azurelinux3.0-distroless-composite-extra, 9.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0 8.0.15-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +8.0.15-trixie-slim-amd64, 8.0-trixie-slim-amd64, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/aspnet/8.0/trixie-slim/amd64/Dockerfile) | Debian 13 8.0.15-alpine3.21-amd64, 8.0-alpine3.21-amd64, 8.0-alpine-amd64, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 8.0.15-alpine3.21-composite-amd64, 8.0-alpine3.21-composite-amd64, 8.0-alpine-composite-amd64, 8.0.15-alpine3.21-composite, 8.0-alpine3.21-composite, 8.0-alpine-composite | [Dockerfile](src/aspnet/8.0/alpine3.21-composite/amd64/Dockerfile) | Alpine 3.21 8.0.15-noble-amd64, 8.0-noble-amd64, 8.0.15-noble, 8.0-noble | [Dockerfile](src/aspnet/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04 @@ -147,6 +149,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.4-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.4-bookworm-slim, 9.0-bookworm-slim, 9.0.4, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +9.0.4-trixie-slim-arm64v8, 9.0-trixie-slim-arm64v8, 9.0.4-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/aspnet/9.0/trixie-slim/arm64v8/Dockerfile) | Debian 13 9.0.4-alpine3.21-arm64v8, 9.0-alpine3.21-arm64v8, 9.0-alpine-arm64v8, 9.0.4-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 9.0.4-alpine3.21-composite-arm64v8, 9.0-alpine3.21-composite-arm64v8, 9.0-alpine-composite-arm64v8, 9.0.4-alpine3.21-composite, 9.0-alpine3.21-composite, 9.0-alpine-composite | [Dockerfile](src/aspnet/9.0/alpine3.21-composite/arm64v8/Dockerfile) | Alpine 3.21 9.0.4-noble-arm64v8, 9.0-noble-arm64v8, 9.0.4-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 @@ -160,6 +163,7 @@ Tags | Dockerfile | OS Version 9.0.4-azurelinux3.0-distroless-composite-arm64v8, 9.0-azurelinux3.0-distroless-composite-arm64v8, 9.0.4-azurelinux3.0-distroless-composite, 9.0-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0 9.0.4-azurelinux3.0-distroless-composite-extra-arm64v8, 9.0-azurelinux3.0-distroless-composite-extra-arm64v8, 9.0.4-azurelinux3.0-distroless-composite-extra, 9.0-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/9.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.15-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +8.0.15-trixie-slim-arm64v8, 8.0-trixie-slim-arm64v8, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/aspnet/8.0/trixie-slim/arm64v8/Dockerfile) | Debian 13 8.0.15-alpine3.21-arm64v8, 8.0-alpine3.21-arm64v8, 8.0-alpine-arm64v8, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 8.0.15-alpine3.21-composite-arm64v8, 8.0-alpine3.21-composite-arm64v8, 8.0-alpine-composite-arm64v8, 8.0.15-alpine3.21-composite, 8.0-alpine3.21-composite, 8.0-alpine-composite | [Dockerfile](src/aspnet/8.0/alpine3.21-composite/arm64v8/Dockerfile) | Alpine 3.21 8.0.15-noble-arm64v8, 8.0-noble-arm64v8, 8.0.15-noble, 8.0-noble | [Dockerfile](src/aspnet/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 @@ -206,6 +210,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.4-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.4-bookworm-slim, 9.0-bookworm-slim, 9.0.4, 9.0 | [Dockerfile](src/aspnet/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +9.0.4-trixie-slim-arm32v7, 9.0-trixie-slim-arm32v7, 9.0.4-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/aspnet/9.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 9.0.4-alpine3.21-arm32v7, 9.0-alpine3.21-arm32v7, 9.0-alpine-arm32v7, 9.0.4-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/aspnet/9.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 9.0.4-alpine3.21-composite-arm32v7, 9.0-alpine3.21-composite-arm32v7, 9.0-alpine-composite-arm32v7, 9.0.4-alpine3.21-composite, 9.0-alpine3.21-composite, 9.0-alpine-composite | [Dockerfile](src/aspnet/9.0/alpine3.21-composite/arm32v7/Dockerfile) | Alpine 3.21 9.0.4-noble-arm32v7, 9.0-noble-arm32v7, 9.0.4-noble, 9.0-noble | [Dockerfile](src/aspnet/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 @@ -214,6 +219,7 @@ Tags | Dockerfile | OS Version 9.0.4-noble-chiseled-composite-arm32v7, 9.0-noble-chiseled-composite-arm32v7, 9.0.4-noble-chiseled-composite, 9.0-noble-chiseled-composite | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-composite-extra-arm32v7, 9.0-noble-chiseled-composite-extra-arm32v7, 9.0.4-noble-chiseled-composite-extra, 9.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04 8.0.15-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +8.0.15-trixie-slim-arm32v7, 8.0-trixie-slim-arm32v7, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 8.0.15-alpine3.21-arm32v7, 8.0-alpine3.21-arm32v7, 8.0-alpine-arm32v7, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-alpine3.21-composite-arm32v7, 8.0-alpine3.21-composite-arm32v7, 8.0-alpine-composite-arm32v7, 8.0.15-alpine3.21-composite, 8.0-alpine3.21-composite, 8.0-alpine-composite | [Dockerfile](src/aspnet/8.0/alpine3.21-composite/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.15-jammy, 8.0-jammy | [Dockerfile](src/aspnet/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 diff --git a/README.runtime-deps.md b/README.runtime-deps.md index 4ed6d0312f..3e38784241 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -69,6 +69,7 @@ They contain the following features: Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.4-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.4-bookworm-slim, 9.0-bookworm-slim, 9.0.4, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +9.0.4-trixie-slim-amd64, 9.0-trixie-slim-amd64, 9.0.4-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/runtime-deps/9.0/trixie-slim/amd64/Dockerfile) | Debian 13 9.0.4-alpine3.21-amd64, 9.0-alpine3.21-amd64, 9.0-alpine-amd64, 9.0.4-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 9.0.4-alpine3.21-extra-amd64, 9.0-alpine3.21-extra-amd64, 9.0-alpine-extra-amd64, 9.0.4-alpine3.21-extra, 9.0-alpine3.21-extra, 9.0-alpine-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.21-extra/amd64/Dockerfile) | Alpine 3.21 9.0.4-noble-amd64, 9.0-noble-amd64, 9.0.4-noble, 9.0-noble | [Dockerfile](src/runtime-deps/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04 @@ -78,6 +79,7 @@ Tags | Dockerfile | OS Version 9.0.4-azurelinux3.0-distroless-amd64, 9.0-azurelinux3.0-distroless-amd64, 9.0.4-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 9.0.4-azurelinux3.0-distroless-extra-amd64, 9.0-azurelinux3.0-distroless-extra-amd64, 9.0.4-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 8.0.15-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +8.0.15-trixie-slim-amd64, 8.0-trixie-slim-amd64, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/runtime-deps/8.0/trixie-slim/amd64/Dockerfile) | Debian 13 8.0.15-alpine3.21-amd64, 8.0-alpine3.21-amd64, 8.0-alpine-amd64, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 8.0.15-alpine3.21-extra-amd64, 8.0-alpine3.21-extra-amd64, 8.0-alpine-extra-amd64, 8.0.15-alpine3.21-extra, 8.0-alpine3.21-extra, 8.0-alpine-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.21-extra/amd64/Dockerfile) | Alpine 3.21 8.0.15-noble-amd64, 8.0-noble-amd64, 8.0.15-noble, 8.0-noble | [Dockerfile](src/runtime-deps/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04 @@ -112,6 +114,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.4-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.4-bookworm-slim, 9.0-bookworm-slim, 9.0.4, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +9.0.4-trixie-slim-arm64v8, 9.0-trixie-slim-arm64v8, 9.0.4-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/runtime-deps/9.0/trixie-slim/arm64v8/Dockerfile) | Debian 13 9.0.4-alpine3.21-arm64v8, 9.0-alpine3.21-arm64v8, 9.0-alpine-arm64v8, 9.0.4-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 9.0.4-alpine3.21-extra-arm64v8, 9.0-alpine3.21-extra-arm64v8, 9.0-alpine-extra-arm64v8, 9.0.4-alpine3.21-extra, 9.0-alpine3.21-extra, 9.0-alpine-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.21-extra/arm64v8/Dockerfile) | Alpine 3.21 9.0.4-noble-arm64v8, 9.0-noble-arm64v8, 9.0.4-noble, 9.0-noble | [Dockerfile](src/runtime-deps/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 @@ -121,6 +124,7 @@ Tags | Dockerfile | OS Version 9.0.4-azurelinux3.0-distroless-arm64v8, 9.0-azurelinux3.0-distroless-arm64v8, 9.0.4-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 9.0.4-azurelinux3.0-distroless-extra-arm64v8, 9.0-azurelinux3.0-distroless-extra-arm64v8, 9.0.4-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.15-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +8.0.15-trixie-slim-arm64v8, 8.0-trixie-slim-arm64v8, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/runtime-deps/8.0/trixie-slim/arm64v8/Dockerfile) | Debian 13 8.0.15-alpine3.21-arm64v8, 8.0-alpine3.21-arm64v8, 8.0-alpine-arm64v8, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 8.0.15-alpine3.21-extra-arm64v8, 8.0-alpine3.21-extra-arm64v8, 8.0-alpine-extra-arm64v8, 8.0.15-alpine3.21-extra, 8.0-alpine3.21-extra, 8.0-alpine-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.21-extra/arm64v8/Dockerfile) | Alpine 3.21 8.0.15-noble-arm64v8, 8.0-noble-arm64v8, 8.0.15-noble, 8.0-noble | [Dockerfile](src/runtime-deps/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 @@ -155,12 +159,14 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.4-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.4-bookworm-slim, 9.0-bookworm-slim, 9.0.4, 9.0 | [Dockerfile](src/runtime-deps/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +9.0.4-trixie-slim-arm32v7, 9.0-trixie-slim-arm32v7, 9.0.4-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/runtime-deps/9.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 9.0.4-alpine3.21-arm32v7, 9.0-alpine3.21-arm32v7, 9.0-alpine-arm32v7, 9.0.4-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/runtime-deps/9.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 9.0.4-alpine3.21-extra-arm32v7, 9.0-alpine3.21-extra-arm32v7, 9.0-alpine-extra-arm32v7, 9.0.4-alpine3.21-extra, 9.0-alpine3.21-extra, 9.0-alpine-extra | [Dockerfile](src/runtime-deps/9.0/alpine3.21-extra/arm32v7/Dockerfile) | Alpine 3.21 9.0.4-noble-arm32v7, 9.0-noble-arm32v7, 9.0.4-noble, 9.0-noble | [Dockerfile](src/runtime-deps/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.4-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.4-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 8.0.15-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +8.0.15-trixie-slim-arm32v7, 8.0-trixie-slim-arm32v7, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 8.0.15-alpine3.21-arm32v7, 8.0-alpine3.21-arm32v7, 8.0-alpine-arm32v7, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-alpine3.21-extra-arm32v7, 8.0-alpine3.21-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.15-alpine3.21-extra, 8.0-alpine3.21-extra, 8.0-alpine-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.21-extra/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.15-jammy, 8.0-jammy | [Dockerfile](src/runtime-deps/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 diff --git a/README.runtime.md b/README.runtime.md index 69090d3fc3..58c41409b3 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -77,6 +77,7 @@ They contain the following features: Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.4-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.4-bookworm-slim, 9.0-bookworm-slim, 9.0.4, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +9.0.4-trixie-slim-amd64, 9.0-trixie-slim-amd64, 9.0.4-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/runtime/9.0/trixie-slim/amd64/Dockerfile) | Debian 13 9.0.4-alpine3.21-amd64, 9.0-alpine3.21-amd64, 9.0-alpine-amd64, 9.0.4-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 9.0.4-noble-amd64, 9.0-noble-amd64, 9.0.4-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-amd64, 9.0-noble-chiseled-amd64, 9.0.4-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04 @@ -85,6 +86,7 @@ Tags | Dockerfile | OS Version 9.0.4-azurelinux3.0-distroless-amd64, 9.0-azurelinux3.0-distroless-amd64, 9.0.4-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 9.0.4-azurelinux3.0-distroless-extra-amd64, 9.0-azurelinux3.0-distroless-extra-amd64, 9.0.4-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 8.0.15-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +8.0.15-trixie-slim-amd64, 8.0-trixie-slim-amd64, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/runtime/8.0/trixie-slim/amd64/Dockerfile) | Debian 13 8.0.15-alpine3.21-amd64, 8.0-alpine3.21-amd64, 8.0-alpine-amd64, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 8.0.15-noble-amd64, 8.0-noble-amd64, 8.0.15-noble, 8.0-noble | [Dockerfile](src/runtime/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04 8.0.15-noble-chiseled-amd64, 8.0-noble-chiseled-amd64, 8.0.15-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime/8.0/noble-chiseled/amd64/Dockerfile) | Ubuntu 24.04 @@ -117,6 +119,7 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.4-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.4-bookworm-slim, 9.0-bookworm-slim, 9.0.4, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +9.0.4-trixie-slim-arm64v8, 9.0-trixie-slim-arm64v8, 9.0.4-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/runtime/9.0/trixie-slim/arm64v8/Dockerfile) | Debian 13 9.0.4-alpine3.21-arm64v8, 9.0-alpine3.21-arm64v8, 9.0-alpine-arm64v8, 9.0.4-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 9.0.4-noble-arm64v8, 9.0-noble-arm64v8, 9.0.4-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-arm64v8, 9.0-noble-chiseled-arm64v8, 9.0.4-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04 @@ -125,6 +128,7 @@ Tags | Dockerfile | OS Version 9.0.4-azurelinux3.0-distroless-arm64v8, 9.0-azurelinux3.0-distroless-arm64v8, 9.0.4-azurelinux3.0-distroless, 9.0-azurelinux3.0-distroless | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 9.0.4-azurelinux3.0-distroless-extra-arm64v8, 9.0-azurelinux3.0-distroless-extra-arm64v8, 9.0.4-azurelinux3.0-distroless-extra, 9.0-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/9.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.15-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +8.0.15-trixie-slim-arm64v8, 8.0-trixie-slim-arm64v8, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/runtime/8.0/trixie-slim/arm64v8/Dockerfile) | Debian 13 8.0.15-alpine3.21-arm64v8, 8.0-alpine3.21-arm64v8, 8.0-alpine-arm64v8, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 8.0.15-noble-arm64v8, 8.0-noble-arm64v8, 8.0.15-noble, 8.0-noble | [Dockerfile](src/runtime/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 8.0.15-noble-chiseled-arm64v8, 8.0-noble-chiseled-arm64v8, 8.0.15-noble-chiseled, 8.0-noble-chiseled | [Dockerfile](src/runtime/8.0/noble-chiseled/arm64v8/Dockerfile) | Ubuntu 24.04 @@ -157,11 +161,13 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.4-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.4-bookworm-slim, 9.0-bookworm-slim, 9.0.4, 9.0 | [Dockerfile](src/runtime/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +9.0.4-trixie-slim-arm32v7, 9.0-trixie-slim-arm32v7, 9.0.4-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/runtime/9.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 9.0.4-alpine3.21-arm32v7, 9.0-alpine3.21-arm32v7, 9.0-alpine-arm32v7, 9.0.4-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/runtime/9.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 9.0.4-noble-arm32v7, 9.0-noble-arm32v7, 9.0.4-noble, 9.0-noble | [Dockerfile](src/runtime/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.4-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.4-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 8.0.15-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +8.0.15-trixie-slim-arm32v7, 8.0-trixie-slim-arm32v7, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/runtime/8.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 8.0.15-alpine3.21-arm32v7, 8.0-alpine3.21-arm32v7, 8.0-alpine-arm32v7, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.15-jammy, 8.0-jammy | [Dockerfile](src/runtime/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 8.0.15-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.15-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04 diff --git a/README.sdk.md b/README.sdk.md index d3be0e3c16..e039b54c06 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -73,10 +73,12 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/ Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.203-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.203-bookworm-slim, 9.0-bookworm-slim, 9.0.203, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +9.0.203-trixie-slim-amd64, 9.0-trixie-slim-amd64, 9.0.203-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/sdk/9.0/trixie-slim/amd64/Dockerfile) | Debian 13 9.0.203-alpine3.21-amd64, 9.0-alpine3.21-amd64, 9.0-alpine-amd64, 9.0.203-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 9.0.203-noble-amd64, 9.0-noble-amd64, 9.0.203-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04 9.0.203-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.203-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 8.0.408-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.408-bookworm-slim, 8.0-bookworm-slim, 8.0.408, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12 +8.0.408-trixie-slim-amd64, 8.0-trixie-slim-amd64, 8.0.408-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/sdk/8.0/trixie-slim/amd64/Dockerfile) | Debian 13 8.0.408-alpine3.21-amd64, 8.0-alpine3.21-amd64, 8.0-alpine-amd64, 8.0.408-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21 8.0.408-noble-amd64, 8.0-noble-amd64, 8.0.408-noble, 8.0-noble | [Dockerfile](src/sdk/8.0/noble/amd64/Dockerfile) | Ubuntu 24.04 8.0.408-jammy-amd64, 8.0-jammy-amd64, 8.0.408-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04 @@ -101,10 +103,12 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.203-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.203-bookworm-slim, 9.0-bookworm-slim, 9.0.203, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +9.0.203-trixie-slim-arm64v8, 9.0-trixie-slim-arm64v8, 9.0.203-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/sdk/9.0/trixie-slim/arm64v8/Dockerfile) | Debian 13 9.0.203-alpine3.21-arm64v8, 9.0-alpine3.21-arm64v8, 9.0-alpine-arm64v8, 9.0.203-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 9.0.203-noble-arm64v8, 9.0-noble-arm64v8, 9.0.203-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 9.0.203-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.203-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 8.0.408-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.408-bookworm-slim, 8.0-bookworm-slim, 8.0.408, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 +8.0.408-trixie-slim-arm64v8, 8.0-trixie-slim-arm64v8, 8.0.408-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/sdk/8.0/trixie-slim/arm64v8/Dockerfile) | Debian 13 8.0.408-alpine3.21-arm64v8, 8.0-alpine3.21-arm64v8, 8.0-alpine-arm64v8, 8.0.408-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21 8.0.408-noble-arm64v8, 8.0-noble-arm64v8, 8.0.408-noble, 8.0-noble | [Dockerfile](src/sdk/8.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04 8.0.408-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.408-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04 @@ -129,9 +133,11 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.203-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.203-bookworm-slim, 9.0-bookworm-slim, 9.0.203, 9.0 | [Dockerfile](src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +9.0.203-trixie-slim-arm32v7, 9.0-trixie-slim-arm32v7, 9.0.203-trixie-slim, 9.0-trixie-slim | [Dockerfile](src/sdk/9.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 9.0.203-alpine3.21-arm32v7, 9.0-alpine3.21-arm32v7, 9.0-alpine-arm32v7, 9.0.203-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 9.0.203-noble-arm32v7, 9.0-noble-arm32v7, 9.0.203-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 8.0.408-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.408-bookworm-slim, 8.0-bookworm-slim, 8.0.408, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 +8.0.408-trixie-slim-arm32v7, 8.0-trixie-slim-arm32v7, 8.0.408-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/sdk/8.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 8.0.408-alpine3.21-arm32v7, 8.0-alpine3.21-arm32v7, 8.0-alpine-arm32v7, 8.0.408-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 8.0.408-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.408-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml index 1bfe0e86f8..2051a5fdcd 100644 --- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml @@ -13,6 +13,7 @@ $(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-composite|.NET 10 Pre $(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-composite-extra|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:10.0-preview-trixie-slim|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:9.0-bookworm-slim) +$(McrTagsYmlTagGroup:9.0-trixie-slim) $(McrTagsYmlTagGroup:9.0-alpine3.21) $(McrTagsYmlTagGroup:9.0-alpine3.21-composite) $(McrTagsYmlTagGroup:9.0-noble) @@ -26,6 +27,7 @@ $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra) $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite) $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite-extra) $(McrTagsYmlTagGroup:8.0-bookworm-slim) +$(McrTagsYmlTagGroup:8.0-trixie-slim) $(McrTagsYmlTagGroup:8.0-alpine3.21) $(McrTagsYmlTagGroup:8.0-alpine3.21-composite) $(McrTagsYmlTagGroup:8.0-noble) diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml index c009d555ec..8217cfa301 100644 --- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml @@ -9,6 +9,7 @@ $(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-extra|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:10.0-preview-trixie-slim|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:9.0-bookworm-slim) +$(McrTagsYmlTagGroup:9.0-trixie-slim) $(McrTagsYmlTagGroup:9.0-alpine3.21) $(McrTagsYmlTagGroup:9.0-alpine3.21-extra) $(McrTagsYmlTagGroup:9.0-noble) @@ -18,6 +19,7 @@ $(McrTagsYmlTagGroup:9.0-azurelinux3.0) $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless) $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra) $(McrTagsYmlTagGroup:8.0-bookworm-slim) +$(McrTagsYmlTagGroup:8.0-trixie-slim) $(McrTagsYmlTagGroup:8.0-alpine3.21) $(McrTagsYmlTagGroup:8.0-alpine3.21-extra) $(McrTagsYmlTagGroup:8.0-noble) diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml index 441c46732b..e7727057d4 100644 --- a/eng/mcr-tags-metadata-templates/runtime-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml @@ -8,6 +8,7 @@ $(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-extra|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:10.0-preview-trixie-slim|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:9.0-bookworm-slim) +$(McrTagsYmlTagGroup:9.0-trixie-slim) $(McrTagsYmlTagGroup:9.0-alpine3.21) $(McrTagsYmlTagGroup:9.0-noble) $(McrTagsYmlTagGroup:9.0-noble-chiseled) @@ -16,6 +17,7 @@ $(McrTagsYmlTagGroup:9.0-azurelinux3.0) $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless) $(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra) $(McrTagsYmlTagGroup:8.0-bookworm-slim) +$(McrTagsYmlTagGroup:8.0-trixie-slim) $(McrTagsYmlTagGroup:8.0-alpine3.21) $(McrTagsYmlTagGroup:8.0-noble) $(McrTagsYmlTagGroup:8.0-noble-chiseled) diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml index 019488c724..de82ff4854 100644 --- a/eng/mcr-tags-metadata-templates/sdk-tags.yml +++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml @@ -8,10 +8,12 @@ $(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-aot|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:10.0-preview-trixie-slim|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:10.0-preview-trixie-slim-aot|.NET 10 Preview Tags) $(McrTagsYmlTagGroup:9.0-bookworm-slim) +$(McrTagsYmlTagGroup:9.0-trixie-slim) $(McrTagsYmlTagGroup:9.0-alpine3.21) $(McrTagsYmlTagGroup:9.0-noble) $(McrTagsYmlTagGroup:9.0-azurelinux3.0) $(McrTagsYmlTagGroup:8.0-bookworm-slim) +$(McrTagsYmlTagGroup:8.0-trixie-slim) $(McrTagsYmlTagGroup:8.0-alpine3.21) $(McrTagsYmlTagGroup:8.0-noble) $(McrTagsYmlTagGroup:8.0-jammy) From a1424208c2aaecb17b7d1d774fd057bcdf92f7f6 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 28 Apr 2025 18:13:36 -0700 Subject: [PATCH 4/7] Update TestData --- tests/Microsoft.DotNet.Docker.Tests/TestData.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index 426e62d136..c6a3b11b58 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -15,6 +15,7 @@ public static class TestData private static readonly ProductImageData[] s_linuxTestData = { new ProductImageData { Version = V8_0, OS = OS.BookwormSlim, Arch = Arch.Amd64 }, + new ProductImageData { Version = V8_0, OS = OS.TrixieSlim, Arch = Arch.Amd64 }, new ProductImageData { Version = V8_0, OS = OS.Jammy, Arch = Arch.Amd64 }, new ProductImageData { Version = V8_0, OS = OS.JammyChiseled, Arch = Arch.Amd64, SdkOS = OS.Jammy }, new ProductImageData { Version = V8_0, OS = OS.JammyChiseled, Arch = Arch.Amd64, SdkOS = OS.Jammy }, @@ -72,6 +73,7 @@ public static class TestData new ProductImageData { Version = V8_0, OS = OS.Mariner20Distroless, Arch = Arch.Arm64, SdkOS = OS.Mariner20, ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet }, new ProductImageData { Version = V8_0, OS = OS.BookwormSlim, Arch = Arch.Arm64 }, + new ProductImageData { Version = V8_0, OS = OS.TrixieSlim, Arch = Arch.Arm64 }, new ProductImageData { Version = V8_0, OS = OS.Jammy, Arch = Arch.Arm64 }, new ProductImageData { Version = V8_0, OS = OS.JammyChiseled, Arch = Arch.Arm64, SdkOS = OS.Jammy }, new ProductImageData { Version = V8_0, OS = OS.JammyChiseled, Arch = Arch.Arm64, SdkOS = OS.Jammy, @@ -95,6 +97,7 @@ public static class TestData ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps }, new ProductImageData { Version = V8_0, OS = OS.BookwormSlim, Arch = Arch.Arm }, + new ProductImageData { Version = V8_0, OS = OS.TrixieSlim, Arch = Arch.Arm }, new ProductImageData { Version = V8_0, OS = OS.Jammy, Arch = Arch.Arm }, new ProductImageData { Version = V8_0, OS = OS.JammyChiseled, Arch = Arch.Arm, SdkOS = OS.Jammy }, new ProductImageData { Version = V8_0, OS = OS.JammyChiseled, Arch = Arch.Arm, SdkOS = OS.Jammy, @@ -111,6 +114,7 @@ public static class TestData new ProductImageData { Version = V9_0, OS = OS.BookwormSlim, Arch = Arch.Amd64 }, + new ProductImageData { Version = V9_0, OS = OS.TrixieSlim, Arch = Arch.Amd64 }, new ProductImageData { Version = V9_0, OS = OS.Noble, Arch = Arch.Amd64 }, new ProductImageData { Version = V9_0, OS = OS.NobleChiseled, Arch = Arch.Amd64, SdkOS = OS.Noble }, new ProductImageData { Version = V9_0, OS = OS.NobleChiseled, Arch = Arch.Amd64, SdkOS = OS.Noble }, @@ -143,6 +147,7 @@ public static class TestData new ProductImageData { Version = V9_0, OS = OS.AzureLinux30Distroless, Arch = Arch.Arm64, SdkOS = OS.AzureLinux30, ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet }, new ProductImageData { Version = V9_0, OS = OS.BookwormSlim, Arch = Arch.Arm64 }, + new ProductImageData { Version = V9_0, OS = OS.TrixieSlim, Arch = Arch.Arm64 }, new ProductImageData { Version = V9_0, OS = OS.Noble, Arch = Arch.Arm64 }, new ProductImageData { Version = V9_0, OS = OS.NobleChiseled, Arch = Arch.Arm64, SdkOS = OS.Noble }, new ProductImageData { Version = V9_0, OS = OS.NobleChiseled, Arch = Arch.Arm64, SdkOS = OS.Noble, @@ -158,6 +163,7 @@ public static class TestData ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps }, new ProductImageData { Version = V9_0, OS = OS.BookwormSlim, Arch = Arch.Arm }, + new ProductImageData { Version = V9_0, OS = OS.TrixieSlim, Arch = Arch.Arm }, new ProductImageData { Version = V9_0, OS = OS.Alpine321, Arch = Arch.Arm }, new ProductImageData { Version = V9_0, OS = OS.Alpine321, Arch = Arch.Arm, SdkOS = OS.Alpine321, ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet }, From 7b6cd249b66a23c50a9160ee2b49ec4524e990f5 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 28 Apr 2025 18:21:38 -0700 Subject: [PATCH 5/7] Update image size file --- .../performance/ImageSize.nightly.linux.json | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tests/performance/ImageSize.nightly.linux.json b/tests/performance/ImageSize.nightly.linux.json index d2dbd5972a..d715b8a23b 100644 --- a/tests/performance/ImageSize.nightly.linux.json +++ b/tests/performance/ImageSize.nightly.linux.json @@ -3,6 +3,9 @@ "src/runtime-deps/8.0/bookworm-slim/amd64": 122238983, "src/runtime-deps/8.0/bookworm-slim/arm32v7": 97861952, "src/runtime-deps/8.0/bookworm-slim/arm64v8": 144762223, + "src/runtime-deps/8.0/trixie-slim/amd64": 122238983, + "src/runtime-deps/8.0/trixie-slim/arm32v7": 97861952, + "src/runtime-deps/8.0/trixie-slim/arm64v8": 144762223, "src/runtime-deps/8.0/alpine3.21/amd64": 10251833, "src/runtime-deps/8.0/alpine3.21/arm32v7": 6858356, "src/runtime-deps/8.0/alpine3.21/arm64v8": 10582917, @@ -39,6 +42,9 @@ "src/runtime-deps/9.0/bookworm-slim/amd64": 122238983, "src/runtime-deps/9.0/bookworm-slim/arm32v7": 97861952, "src/runtime-deps/9.0/bookworm-slim/arm64v8": 144762223, + "src/runtime-deps/9.0/trixie-slim/amd64": 122238983, + "src/runtime-deps/9.0/trixie-slim/arm32v7": 97861952, + "src/runtime-deps/9.0/trixie-slim/arm64v8": 144762223, "src/runtime-deps/9.0/alpine3.21/amd64": 10251833, "src/runtime-deps/9.0/alpine3.21/arm32v7": 6858356, "src/runtime-deps/9.0/alpine3.21/arm64v8": 10582917, @@ -89,6 +95,9 @@ "src/runtime/8.0/bookworm-slim/amd64": 193378063, "src/runtime/8.0/bookworm-slim/arm32v7": 167488698, "src/runtime/8.0/bookworm-slim/arm64v8": 223233946, + "src/runtime/8.0/trixie-slim/amd64": 193378063, + "src/runtime/8.0/trixie-slim/arm32v7": 167488698, + "src/runtime/8.0/trixie-slim/arm64v8": 223233946, "src/runtime/8.0/alpine3.21/amd64": 82940625, "src/runtime/8.0/alpine3.21/arm32v7": 73581244, "src/runtime/8.0/alpine3.21/arm64v8": 89348187, @@ -122,6 +131,9 @@ "src/runtime/9.0/bookworm-slim/amd64": 193906419, "src/runtime/9.0/bookworm-slim/arm32v7": 165821014, "src/runtime/9.0/bookworm-slim/arm64v8": 222493669, + "src/runtime/9.0/trixie-slim/amd64": 193906419, + "src/runtime/9.0/trixie-slim/arm32v7": 165821014, + "src/runtime/9.0/trixie-slim/arm64v8": 222493669, "src/runtime/9.0/alpine3.21/amd64": 83969542, "src/runtime/9.0/alpine3.21/arm32v7": 74931261, "src/runtime/9.0/alpine3.21/arm64v8": 90558408, @@ -166,6 +178,9 @@ "src/aspnet/8.0/bookworm-slim/amd64": 214930477, "src/aspnet/8.0/bookworm-slim/arm32v7": 190908831, "src/aspnet/8.0/bookworm-slim/arm64v8": 247349442, + "src/aspnet/8.0/trixie-slim/amd64": 214930477, + "src/aspnet/8.0/trixie-slim/arm32v7": 190908831, + "src/aspnet/8.0/trixie-slim/arm64v8": 247349442, "src/aspnet/8.0/alpine3.21/amd64": 106914155, "src/aspnet/8.0/alpine3.21/arm32v7": 99021654, "src/aspnet/8.0/alpine3.21/arm64v8": 116109055, @@ -220,6 +235,9 @@ "src/aspnet/9.0/bookworm-slim/amd64": 217891272, "src/aspnet/9.0/bookworm-slim/arm32v7": 191294251, "src/aspnet/9.0/bookworm-slim/arm64v8": 249260740, + "src/aspnet/9.0/trixie-slim/amd64": 217891272, + "src/aspnet/9.0/trixie-slim/arm32v7": 191294251, + "src/aspnet/9.0/trixie-slim/arm64v8": 249260740, "src/aspnet/9.0/alpine3.21/amd64": 107954420, "src/aspnet/9.0/alpine3.21/arm32v7": 100404523, "src/aspnet/9.0/alpine3.21/arm64v8": 117325504, @@ -290,6 +308,9 @@ "src/sdk/8.0/bookworm-slim/amd64": 823543661, "src/sdk/8.0/bookworm-slim/arm32v7": 776844580, "src/sdk/8.0/bookworm-slim/arm64v8": 880785194, + "src/sdk/8.0/trixie-slim/amd64": 823543661, + "src/sdk/8.0/trixie-slim/arm32v7": 776844580, + "src/sdk/8.0/trixie-slim/arm64v8": 880785194, "src/sdk/8.0/alpine3.21/amd64": 688247541, "src/sdk/8.0/alpine3.21/arm32v7": 624778025, "src/sdk/8.0/alpine3.21/arm64v8": 673616900, @@ -305,6 +326,9 @@ "src/sdk/9.0/bookworm-slim/amd64": 896392658, "src/sdk/9.0/bookworm-slim/arm32v7": 844112062, "src/sdk/9.0/bookworm-slim/arm64v8": 952784503, + "src/sdk/9.0/trixie-slim/amd64": 896392658, + "src/sdk/9.0/trixie-slim/arm32v7": 844112062, + "src/sdk/9.0/trixie-slim/arm64v8": 952784503, "src/sdk/9.0/alpine3.21/amd64": 720060909, "src/sdk/9.0/alpine3.21/arm32v7": 688280669, "src/sdk/9.0/alpine3.21/arm64v8": 738892101, @@ -360,5 +384,5 @@ "dotnet/nightly/yarp": { "src/yarp/2.3/azurelinux-distroless/amd64": 141557760, "src/yarp/2.3/azurelinux-distroless/arm64v8": 147836993 - }, + } } From f1a28edb44522838b0620b9d02beb517a065023a Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 29 Apr 2025 08:12:48 -0700 Subject: [PATCH 6/7] Add new test baselines --- ...-trixie-slim-amd64-Dockerfile.approved.txt | 24 ++++++++ ...rixie-slim-arm32v7-Dockerfile.approved.txt | 24 ++++++++ ...rixie-slim-arm64v8-Dockerfile.approved.txt | 24 ++++++++ ...-trixie-slim-amd64-Dockerfile.approved.txt | 24 ++++++++ ...rixie-slim-arm32v7-Dockerfile.approved.txt | 24 ++++++++ ...rixie-slim-arm64v8-Dockerfile.approved.txt | 24 ++++++++ ...-trixie-slim-amd64-Dockerfile.approved.txt | 26 +++++++++ ...rixie-slim-arm32v7-Dockerfile.approved.txt | 26 +++++++++ ...rixie-slim-arm64v8-Dockerfile.approved.txt | 26 +++++++++ ...-trixie-slim-amd64-Dockerfile.approved.txt | 26 +++++++++ ...rixie-slim-arm32v7-Dockerfile.approved.txt | 26 +++++++++ ...rixie-slim-arm64v8-Dockerfile.approved.txt | 26 +++++++++ ...-trixie-slim-amd64-Dockerfile.approved.txt | 33 +++++++++++ ...rixie-slim-arm32v7-Dockerfile.approved.txt | 33 +++++++++++ ...rixie-slim-arm64v8-Dockerfile.approved.txt | 33 +++++++++++ ...-trixie-slim-amd64-Dockerfile.approved.txt | 32 ++++++++++ ...rixie-slim-arm32v7-Dockerfile.approved.txt | 32 ++++++++++ ...rixie-slim-arm64v8-Dockerfile.approved.txt | 32 ++++++++++ ...-trixie-slim-amd64-Dockerfile.approved.txt | 58 +++++++++++++++++++ ...rixie-slim-arm32v7-Dockerfile.approved.txt | 58 +++++++++++++++++++ ...rixie-slim-arm64v8-Dockerfile.approved.txt | 58 +++++++++++++++++++ ...-trixie-slim-amd64-Dockerfile.approved.txt | 58 +++++++++++++++++++ ...rixie-slim-arm32v7-Dockerfile.approved.txt | 58 +++++++++++++++++++ ...rixie-slim-arm64v8-Dockerfile.approved.txt | 58 +++++++++++++++++++ 24 files changed, 843 insertions(+) create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-amd64-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-amd64-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-amd64-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-amd64-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-amd64-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-amd64-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-amd64-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-amd64-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt create mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-amd64-Dockerfile.approved.txt new file mode 100644 index 0000000000..d83deb70e7 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-amd64-Dockerfile.approved.txt @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve ASP.NET Core +RUN aspnetcore_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output aspnetcore.tar.gz "https://artifacts.visualstudio.com/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" \ + && aspnetcore_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-amd64 + +# ASP.NET Core version +ENV ASPNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt new file mode 100644 index 0000000000..b2bf383bc3 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve ASP.NET Core +RUN aspnetcore_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output aspnetcore.tar.gz "https://artifacts.visualstudio.com/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" \ + && aspnetcore_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-arm32v7 + +# ASP.NET Core version +ENV ASPNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt new file mode 100644 index 0000000000..c54a64c978 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve ASP.NET Core +RUN aspnetcore_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output aspnetcore.tar.gz "https://artifacts.visualstudio.com/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" \ + && aspnetcore_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-arm64v8 + +# ASP.NET Core version +ENV ASPNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-amd64-Dockerfile.approved.txt new file mode 100644 index 0000000000..d83deb70e7 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-amd64-Dockerfile.approved.txt @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve ASP.NET Core +RUN aspnetcore_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output aspnetcore.tar.gz "https://artifacts.visualstudio.com/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" \ + && aspnetcore_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-amd64 + +# ASP.NET Core version +ENV ASPNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt new file mode 100644 index 0000000000..b2bf383bc3 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve ASP.NET Core +RUN aspnetcore_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output aspnetcore.tar.gz "https://artifacts.visualstudio.com/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" \ + && aspnetcore_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-arm32v7 + +# ASP.NET Core version +ENV ASPNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt new file mode 100644 index 0000000000..c54a64c978 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt @@ -0,0 +1,24 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve ASP.NET Core +RUN aspnetcore_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output aspnetcore.tar.gz "https://artifacts.visualstudio.com/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" \ + && aspnetcore_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-arm64v8 + +# ASP.NET Core version +ENV ASPNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-amd64-Dockerfile.approved.txt new file mode 100644 index 0000000000..2842373ca2 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-amd64-Dockerfile.approved.txt @@ -0,0 +1,26 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve .NET Runtime +RUN dotnet_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-amd64 + +# .NET Runtime version +ENV DOTNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt new file mode 100644 index 0000000000..e2796461ef --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt @@ -0,0 +1,26 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve .NET Runtime +RUN dotnet_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-arm32v7 + +# .NET Runtime version +ENV DOTNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt new file mode 100644 index 0000000000..6b2e453a43 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt @@ -0,0 +1,26 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve .NET Runtime +RUN dotnet_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-arm64v8 + +# .NET Runtime version +ENV DOTNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-amd64-Dockerfile.approved.txt new file mode 100644 index 0000000000..2842373ca2 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-amd64-Dockerfile.approved.txt @@ -0,0 +1,26 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve .NET Runtime +RUN dotnet_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-amd64 + +# .NET Runtime version +ENV DOTNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt new file mode 100644 index 0000000000..e2796461ef --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt @@ -0,0 +1,26 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve .NET Runtime +RUN dotnet_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-arm32v7 + +# .NET Runtime version +ENV DOTNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt new file mode 100644 index 0000000000..6b2e453a43 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt @@ -0,0 +1,26 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Retrieve .NET Runtime +RUN dotnet_version=0.0.0 \ + && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && 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:0.0.0-trixie-slim-arm64v8 + +# .NET Runtime version +ENV DOTNET_VERSION=0.0.0 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-amd64-Dockerfile.approved.txt new file mode 100644 index 0000000000..042e67dcd2 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-amd64-Dockerfile.approved.txt @@ -0,0 +1,33 @@ +FROM amd64/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt new file mode 100644 index 0000000000..09647b280e --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt @@ -0,0 +1,33 @@ +FROM arm32v7/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt new file mode 100644 index 0000000000..a51b839100 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt @@ -0,0 +1,33 @@ +FROM arm64v8/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + zlib1g \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-amd64-Dockerfile.approved.txt new file mode 100644 index 0000000000..2a52f07951 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-amd64-Dockerfile.approved.txt @@ -0,0 +1,32 @@ +FROM amd64/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt new file mode 100644 index 0000000000..3c0429fc2f --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt @@ -0,0 +1,32 @@ +FROM arm32v7/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt new file mode 100644 index 0000000000..f7252b4448 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt @@ -0,0 +1,32 @@ +FROM arm64v8/debian:trixie-slim + +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 apt-get update \ + && apt-get install -y --no-install-recommends \ + ca-certificates \ + \ + # .NET dependencies + libc6 \ + libgcc-s1 \ + libicu76 \ + libssl3t64 \ + libstdc++6 \ + tzdata \ + && rm -rf /var/lib/apt/lists/* + +# Create a non-root user and group +RUN groupadd \ + --gid=$APP_UID \ + app \ + && useradd -l \ + --uid=$APP_UID \ + --gid=$APP_UID \ + --create-home \ + app diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-amd64-Dockerfile.approved.txt new file mode 100644 index 0000000000..d06ffcb866 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-amd64-Dockerfile.approved.txt @@ -0,0 +1,58 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Install .NET SDK +RUN curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Sdk/0.0.0/dotnet-sdk-0.0.0-linux-x64.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:0.0.0-trixie-slim-amd64 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=0.0.0 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=0.0.0 \ + && curl -fSL --output PowerShell.Linux.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \ + && powershell_sha512='{sha512_placeholder}' \ + && echo "$powershell_sha512 PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.x64.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt new file mode 100644 index 0000000000..44c3643d7b --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt @@ -0,0 +1,58 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +ARG ACCESSTOKEN + +# Install .NET SDK +RUN curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Sdk/0.0.0/dotnet-sdk-0.0.0-linux-arm.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:0.0.0-trixie-slim-arm32v7 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=0.0.0 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm32 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=0.0.0 \ + && curl -fSL --output PowerShell.Linux.arm32.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \ + && powershell_sha512='{sha512_placeholder}' \ + && echo "$powershell_sha512 PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.arm32.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt new file mode 100644 index 0000000000..78fbc41239 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm64v8-Dockerfile.approved.txt @@ -0,0 +1,58 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Install .NET SDK +RUN curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Sdk/0.0.0/dotnet-sdk-0.0.0-linux-arm64.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:0.0.0-trixie-slim-arm64v8 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=0.0.0 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm64 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=0.0.0 \ + && curl -fSL --output PowerShell.Linux.arm64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \ + && powershell_sha512='{sha512_placeholder}' \ + && echo "$powershell_sha512 PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.arm64.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-amd64-Dockerfile.approved.txt new file mode 100644 index 0000000000..d06ffcb866 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-amd64-Dockerfile.approved.txt @@ -0,0 +1,58 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM amd64/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Install .NET SDK +RUN curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Sdk/0.0.0/dotnet-sdk-0.0.0-linux-x64.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:0.0.0-trixie-slim-amd64 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=0.0.0 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=0.0.0 \ + && curl -fSL --output PowerShell.Linux.x64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.x64.$powershell_version.nupkg \ + && powershell_sha512='{sha512_placeholder}' \ + && echo "$powershell_sha512 PowerShell.Linux.x64.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.x64 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.x64.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt new file mode 100644 index 0000000000..44c3643d7b --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-arm32v7-Dockerfile.approved.txt @@ -0,0 +1,58 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM arm32v7/buildpack-deps:bookworm-curl AS installer + +ARG ACCESSTOKEN + +# Install .NET SDK +RUN curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Sdk/0.0.0/dotnet-sdk-0.0.0-linux-arm.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:0.0.0-trixie-slim-arm32v7 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=0.0.0 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm32 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=0.0.0 \ + && curl -fSL --output PowerShell.Linux.arm32.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \ + && powershell_sha512='{sha512_placeholder}' \ + && echo "$powershell_sha512 PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.arm32.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt new file mode 100644 index 0000000000..78fbc41239 --- /dev/null +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-9.0-trixie-slim-arm64v8-Dockerfile.approved.txt @@ -0,0 +1,58 @@ +ARG REPO=mcr.microsoft.com/dotnet/aspnet +# Installer image +FROM arm64v8/buildpack-deps:trixie-curl AS installer + +ARG ACCESSTOKEN + +# Install .NET SDK +RUN curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Sdk/0.0.0/dotnet-sdk-0.0.0-linux-arm64.tar.gz" \ + && dotnet_sha512='{sha512_placeholder}' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /dotnet \ + && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && rm dotnet.tar.gz + + +# .NET SDK image +FROM $REPO:0.0.0-trixie-slim-arm64v8 + +ENV \ + # Do not generate certificate + DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ + # Do not show first run text + DOTNET_NOLOGO=true \ + # SDK version + DOTNET_SDK_VERSION=0.0.0 \ + # 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 + NUGET_XMLDOC_MODE=skip \ + # PowerShell telemetry for docker image usage + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm64 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + curl \ + git \ + libatomic1 \ + wget \ + && rm -rf /var/lib/apt/lists/* + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] + +# Trigger first run experience by running arbitrary cmd +RUN dotnet help + +# Install PowerShell global tool +RUN powershell_version=0.0.0 \ + && curl -fSL --output PowerShell.Linux.arm64.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm64.$powershell_version.nupkg \ + && powershell_sha512='{sha512_placeholder}' \ + && echo "$powershell_sha512 PowerShell.Linux.arm64.$powershell_version.nupkg" | sha512sum -c - \ + && mkdir -p /usr/share/powershell \ + && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm64 \ + && dotnet nuget locals all --clear \ + && rm PowerShell.Linux.arm64.$powershell_version.nupkg \ + && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ + && chmod 755 /usr/share/powershell/pwsh \ + # To reduce image size, remove the copy nupkg that nuget keeps. + && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm From f75984a864df2b7c5e893969198230382791ce7b Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 29 Apr 2025 14:33:36 -0700 Subject: [PATCH 7/7] Remove .NET 8 Arm32 Trixie images --- README.aspnet.md | 1 - README.runtime-deps.md | 1 - README.runtime.md | 1 - README.sdk.md | 1 - manifest.json | 57 ------------------ src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile | 22 ------- .../8.0/trixie-slim/arm32v7/Dockerfile | 33 ----------- .../8.0/trixie-slim/arm32v7/Dockerfile | 24 -------- src/sdk/8.0/trixie-slim/arm32v7/Dockerfile | 56 ------------------ ...rixie-slim-arm32v7-Dockerfile.approved.txt | 24 -------- ...rixie-slim-arm32v7-Dockerfile.approved.txt | 26 --------- ...rixie-slim-arm32v7-Dockerfile.approved.txt | 33 ----------- ...rixie-slim-arm32v7-Dockerfile.approved.txt | 58 ------------------- .../Microsoft.DotNet.Docker.Tests/TestData.cs | 1 - .../performance/ImageSize.nightly.linux.json | 4 -- 15 files changed, 342 deletions(-) delete mode 100644 src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile delete mode 100644 src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile delete mode 100644 src/runtime/8.0/trixie-slim/arm32v7/Dockerfile delete mode 100644 src/sdk/8.0/trixie-slim/arm32v7/Dockerfile delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt delete mode 100644 tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt diff --git a/README.aspnet.md b/README.aspnet.md index 9500c48cfc..122123960f 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -219,7 +219,6 @@ Tags | Dockerfile | OS Version 9.0.4-noble-chiseled-composite-arm32v7, 9.0-noble-chiseled-composite-arm32v7, 9.0.4-noble-chiseled-composite, 9.0-noble-chiseled-composite | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-composite-extra-arm32v7, 9.0-noble-chiseled-composite-extra-arm32v7, 9.0.4-noble-chiseled-composite-extra, 9.0-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/9.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04 8.0.15-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/aspnet/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 -8.0.15-trixie-slim-arm32v7, 8.0-trixie-slim-arm32v7, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 8.0.15-alpine3.21-arm32v7, 8.0-alpine3.21-arm32v7, 8.0-alpine-arm32v7, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/aspnet/8.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-alpine3.21-composite-arm32v7, 8.0-alpine3.21-composite-arm32v7, 8.0-alpine-composite-arm32v7, 8.0.15-alpine3.21-composite, 8.0-alpine3.21-composite, 8.0-alpine-composite | [Dockerfile](src/aspnet/8.0/alpine3.21-composite/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.15-jammy, 8.0-jammy | [Dockerfile](src/aspnet/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 diff --git a/README.runtime-deps.md b/README.runtime-deps.md index 3e38784241..8aae81bdc0 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -166,7 +166,6 @@ Tags | Dockerfile | OS Version 9.0.4-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.4-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.4-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 8.0.15-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/runtime-deps/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 -8.0.15-trixie-slim-arm32v7, 8.0-trixie-slim-arm32v7, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 8.0.15-alpine3.21-arm32v7, 8.0-alpine3.21-arm32v7, 8.0-alpine-arm32v7, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/runtime-deps/8.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-alpine3.21-extra-arm32v7, 8.0-alpine3.21-extra-arm32v7, 8.0-alpine-extra-arm32v7, 8.0.15-alpine3.21-extra, 8.0-alpine3.21-extra, 8.0-alpine-extra | [Dockerfile](src/runtime-deps/8.0/alpine3.21-extra/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.15-jammy, 8.0-jammy | [Dockerfile](src/runtime-deps/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 diff --git a/README.runtime.md b/README.runtime.md index 58c41409b3..dfc0dc221e 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -167,7 +167,6 @@ Tags | Dockerfile | OS Version 9.0.4-noble-chiseled-arm32v7, 9.0-noble-chiseled-arm32v7, 9.0.4-noble-chiseled, 9.0-noble-chiseled | [Dockerfile](src/runtime/9.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04 9.0.4-noble-chiseled-extra-arm32v7, 9.0-noble-chiseled-extra-arm32v7, 9.0.4-noble-chiseled-extra, 9.0-noble-chiseled-extra | [Dockerfile](src/runtime/9.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04 8.0.15-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.15-bookworm-slim, 8.0-bookworm-slim, 8.0.15, 8.0 | [Dockerfile](src/runtime/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 -8.0.15-trixie-slim-arm32v7, 8.0-trixie-slim-arm32v7, 8.0.15-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/runtime/8.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 8.0.15-alpine3.21-arm32v7, 8.0-alpine3.21-arm32v7, 8.0-alpine-arm32v7, 8.0.15-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/runtime/8.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 8.0.15-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.15-jammy, 8.0-jammy | [Dockerfile](src/runtime/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 8.0.15-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.15-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04 diff --git a/README.sdk.md b/README.sdk.md index e039b54c06..57479d41bf 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -137,7 +137,6 @@ Tags | Dockerfile | OS Version 9.0.203-alpine3.21-arm32v7, 9.0-alpine3.21-arm32v7, 9.0-alpine-arm32v7, 9.0.203-alpine3.21, 9.0-alpine3.21, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 9.0.203-noble-arm32v7, 9.0-noble-arm32v7, 9.0.203-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04 8.0.408-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.408-bookworm-slim, 8.0-bookworm-slim, 8.0.408, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 -8.0.408-trixie-slim-arm32v7, 8.0-trixie-slim-arm32v7, 8.0.408-trixie-slim, 8.0-trixie-slim | [Dockerfile](src/sdk/8.0/trixie-slim/arm32v7/Dockerfile) | Debian 13 8.0.408-alpine3.21-arm32v7, 8.0-alpine3.21-arm32v7, 8.0-alpine-arm32v7, 8.0.408-alpine3.21, 8.0-alpine3.21, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21 8.0.408-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.408-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 diff --git a/manifest.json b/manifest.json index a67ecd84e7..386a8a8994 100644 --- a/manifest.json +++ b/manifest.json @@ -95,18 +95,6 @@ "$(dotnet|8.0|minor-tag)-trixie-slim-amd64": {} } }, - { - "architecture": "arm", - "dockerfile": "src/runtime-deps/8.0/trixie-slim/arm32v7", - "dockerfileTemplate": "eng/dockerfile-templates/runtime-deps/Dockerfile", - "os": "linux", - "osVersion": "trixie-slim", - "tags": { - "$(dotnet|8.0|fixed-tag)-trixie-slim-arm32v7": {}, - "$(dotnet|8.0|minor-tag)-trixie-slim-arm32v7": {} - }, - "variant": "v7" - }, { "architecture": "arm64", "dockerfile": "src/runtime-deps/8.0/trixie-slim/arm64v8", @@ -2191,21 +2179,6 @@ "$(dotnet|8.0|minor-tag)-trixie-slim-amd64": {} } }, - { - "architecture": "arm", - "buildArgs": { - "REPO": "$(Repo:runtime-deps)" - }, - "dockerfile": "src/runtime/8.0/trixie-slim/arm32v7", - "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux", - "os": "linux", - "osVersion": "trixie-slim", - "tags": { - "$(dotnet|8.0|fixed-tag)-trixie-slim-arm32v7": {}, - "$(dotnet|8.0|minor-tag)-trixie-slim-arm32v7": {} - }, - "variant": "v7" - }, { "architecture": "arm64", "buildArgs": { @@ -4405,21 +4378,6 @@ "$(dotnet|8.0|minor-tag)-trixie-slim-amd64": {} } }, - { - "architecture": "arm", - "buildArgs": { - "REPO": "$(Repo:runtime)" - }, - "dockerfile": "src/aspnet/8.0/trixie-slim/arm32v7", - "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux", - "os": "linux", - "osVersion": "trixie-slim", - "tags": { - "$(dotnet|8.0|fixed-tag)-trixie-slim-arm32v7": {}, - "$(dotnet|8.0|minor-tag)-trixie-slim-arm32v7": {} - }, - "variant": "v7" - }, { "architecture": "arm64", "buildArgs": { @@ -7769,21 +7727,6 @@ "$(sdk|8.0|minor-tag)-trixie-slim-amd64": {} } }, - { - "buildArgs": { - "REPO": "$(Repo:aspnet)" - }, - "architecture": "arm", - "dockerfile": "src/sdk/8.0/trixie-slim/arm32v7", - "dockerfileTemplate": "eng/dockerfile-templates/sdk/Dockerfile.linux", - "os": "linux", - "osVersion": "trixie-slim", - "tags": { - "$(sdk|8.0|fixed-tag)-trixie-slim-arm32v7": {}, - "$(sdk|8.0|minor-tag)-trixie-slim-arm32v7": {} - }, - "variant": "v7" - }, { "buildArgs": { "REPO": "$(Repo:aspnet)" diff --git a/src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile b/src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile deleted file mode 100644 index eff1eb93c4..0000000000 --- a/src/aspnet/8.0/trixie-slim/arm32v7/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/runtime - -# Installer image -FROM arm32v7/buildpack-deps:bookworm-curl AS installer - -# Retrieve ASP.NET Core -RUN aspnetcore_version=8.0.15 \ - && curl -fSL --output aspnetcore.tar.gz https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - && aspnetcore_sha512='0995e596c1fd02f5e89a7f695b93976af253841ef30fe83a05310a3fcf4e069692c5620e80355dcd3fe6ae32e7b5adbae0bb3f0ff35e334c2f28f14c44dca6ef' \ - && 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.15-trixie-slim-arm32v7 - -# ASP.NET Core version -ENV ASPNET_VERSION=8.0.15 - -COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile b/src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile deleted file mode 100644 index 09647b280e..0000000000 --- a/src/runtime-deps/8.0/trixie-slim/arm32v7/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM arm32v7/debian:trixie-slim - -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 apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - \ - # .NET dependencies - libc6 \ - libgcc-s1 \ - libicu76 \ - libssl3t64 \ - libstdc++6 \ - tzdata \ - zlib1g \ - && rm -rf /var/lib/apt/lists/* - -# Create a non-root user and group -RUN groupadd \ - --gid=$APP_UID \ - app \ - && useradd -l \ - --uid=$APP_UID \ - --gid=$APP_UID \ - --create-home \ - app diff --git a/src/runtime/8.0/trixie-slim/arm32v7/Dockerfile b/src/runtime/8.0/trixie-slim/arm32v7/Dockerfile deleted file mode 100644 index 27d5259733..0000000000 --- a/src/runtime/8.0/trixie-slim/arm32v7/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/runtime-deps - -# Installer image -FROM arm32v7/buildpack-deps:bookworm-curl AS installer - -# Retrieve .NET Runtime -RUN dotnet_version=8.0.15 \ - && curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - && dotnet_sha512='2b6f4f7285f9cdc39ef48464081e9962a1f0abcd468c84e88a4d10a7e175d30ff1f3b58c48a483958f97e1a33a5c8a223510313066b5a6e5b35d0dead86ddefa' \ - && 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.15-trixie-slim-arm32v7 - -# .NET Runtime version -ENV DOTNET_VERSION=8.0.15 - -COPY --from=installer ["/dotnet", "/usr/share/dotnet"] - -RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/sdk/8.0/trixie-slim/arm32v7/Dockerfile b/src/sdk/8.0/trixie-slim/arm32v7/Dockerfile deleted file mode 100644 index 1fa3213f76..0000000000 --- a/src/sdk/8.0/trixie-slim/arm32v7/Dockerfile +++ /dev/null @@ -1,56 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/aspnet -# Installer image -FROM arm32v7/buildpack-deps:bookworm-curl AS installer - -# Install .NET SDK -RUN curl -fSL --output dotnet.tar.gz https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.408/dotnet-sdk-8.0.408-linux-arm.tar.gz \ - && dotnet_sha512='9686fc37b42a322e8acaf3991f68837cfef10a41aef323286331e63123ca34a9367bf4274dd14ce019ca37345d6d868cfbfe4fbcd353f57fd3035151b97983f9' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /dotnet \ - && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ - && rm dotnet.tar.gz - - -# .NET SDK image -FROM $REPO:8.0.15-trixie-slim-arm32v7 - -ENV \ - # Do not generate certificate - DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ - # Do not show first run text - DOTNET_NOLOGO=true \ - # SDK version - DOTNET_SDK_VERSION=8.0.408 \ - # 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 - NUGET_XMLDOC_MODE=skip \ - # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm32 - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - git \ - libatomic1 \ - wget \ - && rm -rf /var/lib/apt/lists/* - -COPY --from=installer ["/dotnet", "/usr/share/dotnet"] - -# Trigger first run experience by running arbitrary cmd -RUN dotnet help - -# Install PowerShell global tool -RUN powershell_version=7.4.7 \ - && curl -fSL --output PowerShell.Linux.arm32.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \ - && powershell_sha512='727c67c3d29e3f3216366b5e2487b14baf926ab36da58833aecb84d663e4a6f61d2c073d7a99f7b05294cea71f3d37c90bbd237cd4cad6491dd8031544c16841' \ - && echo "$powershell_sha512 PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \ - && mkdir -p /usr/share/powershell \ - && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \ - && dotnet nuget locals all --clear \ - && rm PowerShell.Linux.arm32.$powershell_version.nupkg \ - && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ - && chmod 755 /usr/share/powershell/pwsh \ - # To reduce image size, remove the copy nupkg that nuget keeps. - && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt deleted file mode 100644 index b2bf383bc3..0000000000 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt +++ /dev/null @@ -1,24 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/runtime - -# Installer image -FROM arm32v7/buildpack-deps:bookworm-curl AS installer - -ARG ACCESSTOKEN - -# Retrieve ASP.NET Core -RUN aspnetcore_version=0.0.0 \ - && curl -u :$ACCESSTOKEN --basic -fSL --output aspnetcore.tar.gz "https://artifacts.visualstudio.com/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" \ - && aspnetcore_sha512='{sha512_placeholder}' \ - && 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:0.0.0-trixie-slim-arm32v7 - -# ASP.NET Core version -ENV ASPNET_VERSION=0.0.0 - -COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt deleted file mode 100644 index e2796461ef..0000000000 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt +++ /dev/null @@ -1,26 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/runtime-deps - -# Installer image -FROM arm32v7/buildpack-deps:bookworm-curl AS installer - -ARG ACCESSTOKEN - -# Retrieve .NET Runtime -RUN dotnet_version=0.0.0 \ - && curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz" \ - && dotnet_sha512='{sha512_placeholder}' \ - && 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:0.0.0-trixie-slim-arm32v7 - -# .NET Runtime version -ENV DOTNET_VERSION=0.0.0 - -COPY --from=installer ["/dotnet", "/usr/share/dotnet"] - -RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt deleted file mode 100644 index 09647b280e..0000000000 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt +++ /dev/null @@ -1,33 +0,0 @@ -FROM arm32v7/debian:trixie-slim - -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 apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - \ - # .NET dependencies - libc6 \ - libgcc-s1 \ - libicu76 \ - libssl3t64 \ - libstdc++6 \ - tzdata \ - zlib1g \ - && rm -rf /var/lib/apt/lists/* - -# Create a non-root user and group -RUN groupadd \ - --gid=$APP_UID \ - app \ - && useradd -l \ - --uid=$APP_UID \ - --gid=$APP_UID \ - --create-home \ - app diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt deleted file mode 100644 index 44c3643d7b..0000000000 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-8.0-trixie-slim-arm32v7-Dockerfile.approved.txt +++ /dev/null @@ -1,58 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/aspnet -# Installer image -FROM arm32v7/buildpack-deps:bookworm-curl AS installer - -ARG ACCESSTOKEN - -# Install .NET SDK -RUN curl -u :$ACCESSTOKEN --basic -fSL --output dotnet.tar.gz "https://artifacts.visualstudio.com/Sdk/0.0.0/dotnet-sdk-0.0.0-linux-arm.tar.gz" \ - && dotnet_sha512='{sha512_placeholder}' \ - && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ - && mkdir -p /dotnet \ - && tar -oxzf dotnet.tar.gz -C /dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ - && rm dotnet.tar.gz - - -# .NET SDK image -FROM $REPO:0.0.0-trixie-slim-arm32v7 - -ENV \ - # Do not generate certificate - DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ - # Do not show first run text - DOTNET_NOLOGO=true \ - # SDK version - DOTNET_SDK_VERSION=0.0.0 \ - # 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 - NUGET_XMLDOC_MODE=skip \ - # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Debian-13-arm32 - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - curl \ - git \ - libatomic1 \ - wget \ - && rm -rf /var/lib/apt/lists/* - -COPY --from=installer ["/dotnet", "/usr/share/dotnet"] - -# Trigger first run experience by running arbitrary cmd -RUN dotnet help - -# Install PowerShell global tool -RUN powershell_version=0.0.0 \ - && curl -fSL --output PowerShell.Linux.arm32.$powershell_version.nupkg https://powershellinfraartifacts-gkhedzdeaghdezhr.z01.azurefd.net/tool/$powershell_version/PowerShell.Linux.arm32.$powershell_version.nupkg \ - && powershell_sha512='{sha512_placeholder}' \ - && echo "$powershell_sha512 PowerShell.Linux.arm32.$powershell_version.nupkg" | sha512sum -c - \ - && mkdir -p /usr/share/powershell \ - && dotnet tool install --add-source / --tool-path /usr/share/powershell --version $powershell_version PowerShell.Linux.arm32 \ - && dotnet nuget locals all --clear \ - && rm PowerShell.Linux.arm32.$powershell_version.nupkg \ - && ln -s /usr/share/powershell/pwsh /usr/bin/pwsh \ - && chmod 755 /usr/share/powershell/pwsh \ - # To reduce image size, remove the copy nupkg that nuget keeps. - && find /usr/share/powershell -print | grep -i '.*[.]nupkg$' | xargs rm diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index c6a3b11b58..767e563c8a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -97,7 +97,6 @@ public static class TestData ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps }, new ProductImageData { Version = V8_0, OS = OS.BookwormSlim, Arch = Arch.Arm }, - new ProductImageData { Version = V8_0, OS = OS.TrixieSlim, Arch = Arch.Arm }, new ProductImageData { Version = V8_0, OS = OS.Jammy, Arch = Arch.Arm }, new ProductImageData { Version = V8_0, OS = OS.JammyChiseled, Arch = Arch.Arm, SdkOS = OS.Jammy }, new ProductImageData { Version = V8_0, OS = OS.JammyChiseled, Arch = Arch.Arm, SdkOS = OS.Jammy, diff --git a/tests/performance/ImageSize.nightly.linux.json b/tests/performance/ImageSize.nightly.linux.json index d715b8a23b..2873799123 100644 --- a/tests/performance/ImageSize.nightly.linux.json +++ b/tests/performance/ImageSize.nightly.linux.json @@ -4,7 +4,6 @@ "src/runtime-deps/8.0/bookworm-slim/arm32v7": 97861952, "src/runtime-deps/8.0/bookworm-slim/arm64v8": 144762223, "src/runtime-deps/8.0/trixie-slim/amd64": 122238983, - "src/runtime-deps/8.0/trixie-slim/arm32v7": 97861952, "src/runtime-deps/8.0/trixie-slim/arm64v8": 144762223, "src/runtime-deps/8.0/alpine3.21/amd64": 10251833, "src/runtime-deps/8.0/alpine3.21/arm32v7": 6858356, @@ -96,7 +95,6 @@ "src/runtime/8.0/bookworm-slim/arm32v7": 167488698, "src/runtime/8.0/bookworm-slim/arm64v8": 223233946, "src/runtime/8.0/trixie-slim/amd64": 193378063, - "src/runtime/8.0/trixie-slim/arm32v7": 167488698, "src/runtime/8.0/trixie-slim/arm64v8": 223233946, "src/runtime/8.0/alpine3.21/amd64": 82940625, "src/runtime/8.0/alpine3.21/arm32v7": 73581244, @@ -179,7 +177,6 @@ "src/aspnet/8.0/bookworm-slim/arm32v7": 190908831, "src/aspnet/8.0/bookworm-slim/arm64v8": 247349442, "src/aspnet/8.0/trixie-slim/amd64": 214930477, - "src/aspnet/8.0/trixie-slim/arm32v7": 190908831, "src/aspnet/8.0/trixie-slim/arm64v8": 247349442, "src/aspnet/8.0/alpine3.21/amd64": 106914155, "src/aspnet/8.0/alpine3.21/arm32v7": 99021654, @@ -309,7 +306,6 @@ "src/sdk/8.0/bookworm-slim/arm32v7": 776844580, "src/sdk/8.0/bookworm-slim/arm64v8": 880785194, "src/sdk/8.0/trixie-slim/amd64": 823543661, - "src/sdk/8.0/trixie-slim/arm32v7": 776844580, "src/sdk/8.0/trixie-slim/arm64v8": 880785194, "src/sdk/8.0/alpine3.21/amd64": 688247541, "src/sdk/8.0/alpine3.21/arm32v7": 624778025,