diff --git a/README.aspnet.md b/README.aspnet.md index 622b7dd550..8174bbf0b7 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -84,7 +84,9 @@ Tags | Dockerfile | OS Version 8.0.3-jammy-chiseled-composite-extra-amd64, 8.0-jammy-chiseled-composite-extra-amd64, 8.0.3-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/jammy-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 22.04 8.0.3-cbl-mariner2.0-amd64, 8.0-cbl-mariner2.0-amd64, 8.0-cbl-mariner-amd64, 8.0.3-cbl-mariner2.0, 8.0-cbl-mariner2.0, 8.0-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0/amd64/Dockerfile) | CBL-Mariner 2.0 8.0.3-cbl-mariner2.0-distroless-amd64, 8.0-cbl-mariner2.0-distroless-amd64, 8.0-cbl-mariner-distroless-amd64, 8.0.3-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile) | CBL-Mariner 2.0-distroless +8.0.3-cbl-mariner2.0-distroless-extra-amd64, 8.0-cbl-mariner2.0-distroless-extra-amd64, 8.0.3-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile) | CBL-Mariner 2.0-distroless 8.0.3-cbl-mariner2.0-distroless-composite-amd64, 8.0-cbl-mariner2.0-distroless-composite-amd64, 8.0-cbl-mariner-distroless-composite-amd64, 8.0.3-cbl-mariner2.0-distroless-composite, 8.0-cbl-mariner2.0-distroless-composite, 8.0-cbl-mariner-distroless-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/amd64/Dockerfile) | CBL-Mariner 2.0-distroless +8.0.3-cbl-mariner2.0-distroless-composite-extra-amd64, 8.0-cbl-mariner2.0-distroless-composite-extra-amd64, 8.0-cbl-mariner-distroless-composite-extra-amd64, 8.0.3-cbl-mariner2.0-distroless-composite-extra, 8.0-cbl-mariner2.0-distroless-composite-extra, 8.0-cbl-mariner-distroless-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64/Dockerfile) | CBL-Mariner 2.0-distroless 7.0.17-bookworm-slim-amd64, 7.0-bookworm-slim-amd64, 7.0.17-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/bookworm-slim/amd64/Dockerfile) | Debian 12 7.0.17-bullseye-slim-amd64, 7.0-bullseye-slim-amd64, 7.0.17-bullseye-slim, 7.0-bullseye-slim, 7.0.17, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/bullseye-slim/amd64/Dockerfile) | Debian 11 7.0.17-alpine3.18-amd64, 7.0-alpine3.18-amd64, 7.0-alpine-amd64, 7.0.17-alpine3.18, 7.0-alpine3.18 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/alpine3.18/amd64/Dockerfile) | Alpine 3.18 @@ -135,7 +137,9 @@ Tags | Dockerfile | OS Version 8.0.3-jammy-chiseled-composite-extra-arm64v8, 8.0-jammy-chiseled-composite-extra-arm64v8, 8.0.3-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.3-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner-arm64v8, 8.0.3-cbl-mariner2.0, 8.0-cbl-mariner2.0, 8.0-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0/arm64v8/Dockerfile) | CBL-Mariner 2.0 8.0.3-cbl-mariner2.0-distroless-arm64v8, 8.0-cbl-mariner2.0-distroless-arm64v8, 8.0-cbl-mariner-distroless-arm64v8, 8.0.3-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0-distroless +8.0.3-cbl-mariner2.0-distroless-extra-arm64v8, 8.0-cbl-mariner2.0-distroless-extra-arm64v8, 8.0.3-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile) | CBL-Mariner 2.0-distroless 8.0.3-cbl-mariner2.0-distroless-composite-arm64v8, 8.0-cbl-mariner2.0-distroless-composite-arm64v8, 8.0-cbl-mariner-distroless-composite-arm64v8, 8.0.3-cbl-mariner2.0-distroless-composite, 8.0-cbl-mariner2.0-distroless-composite, 8.0-cbl-mariner-distroless-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless-composite/arm64v8/Dockerfile) | CBL-Mariner 2.0-distroless +8.0.3-cbl-mariner2.0-distroless-composite-extra-arm64v8, 8.0-cbl-mariner2.0-distroless-composite-extra-arm64v8, 8.0-cbl-mariner-distroless-composite-extra-arm64v8, 8.0.3-cbl-mariner2.0-distroless-composite-extra, 8.0-cbl-mariner2.0-distroless-composite-extra, 8.0-cbl-mariner-distroless-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8/Dockerfile) | CBL-Mariner 2.0-distroless 7.0.17-bookworm-slim-arm64v8, 7.0-bookworm-slim-arm64v8, 7.0.17-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 7.0.17-bullseye-slim-arm64v8, 7.0-bullseye-slim-arm64v8, 7.0.17-bullseye-slim, 7.0-bullseye-slim, 7.0.17, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 7.0.17-alpine3.18-arm64v8, 7.0-alpine3.18-arm64v8, 7.0-alpine-arm64v8, 7.0.17-alpine3.18, 7.0-alpine3.18 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspnet/7.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18 diff --git a/README.runtime.md b/README.runtime.md index a5ed0398ec..7edda50f2f 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -69,6 +69,7 @@ Tags | Dockerfile | OS Version 8.0.3-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.3-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04 8.0.3-cbl-mariner2.0-amd64, 8.0-cbl-mariner2.0-amd64, 8.0-cbl-mariner-amd64, 8.0.3-cbl-mariner2.0, 8.0-cbl-mariner2.0, 8.0-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0/amd64/Dockerfile) | CBL-Mariner 2.0 8.0.3-cbl-mariner2.0-distroless-amd64, 8.0-cbl-mariner2.0-distroless-amd64, 8.0-cbl-mariner-distroless-amd64, 8.0.3-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0-distroless/amd64/Dockerfile) | CBL-Mariner 2.0-distroless +8.0.3-cbl-mariner2.0-distroless-extra-amd64, 8.0-cbl-mariner2.0-distroless-extra-amd64, 8.0.3-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile) | CBL-Mariner 2.0-distroless 7.0.17-bookworm-slim-amd64, 7.0-bookworm-slim-amd64, 7.0.17-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/bookworm-slim/amd64/Dockerfile) | Debian 12 7.0.17-bullseye-slim-amd64, 7.0-bullseye-slim-amd64, 7.0.17-bullseye-slim, 7.0-bullseye-slim, 7.0.17, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/bullseye-slim/amd64/Dockerfile) | Debian 11 7.0.17-alpine3.18-amd64, 7.0-alpine3.18-amd64, 7.0-alpine-amd64, 7.0.17-alpine3.18, 7.0-alpine3.18 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/alpine3.18/amd64/Dockerfile) | Alpine 3.18 @@ -111,6 +112,7 @@ Tags | Dockerfile | OS Version 8.0.3-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.3-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.3-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner-arm64v8, 8.0.3-cbl-mariner2.0, 8.0-cbl-mariner2.0, 8.0-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0/arm64v8/Dockerfile) | CBL-Mariner 2.0 8.0.3-cbl-mariner2.0-distroless-arm64v8, 8.0-cbl-mariner2.0-distroless-arm64v8, 8.0-cbl-mariner-distroless-arm64v8, 8.0.3-cbl-mariner2.0-distroless, 8.0-cbl-mariner2.0-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0-distroless +8.0.3-cbl-mariner2.0-distroless-extra-arm64v8, 8.0-cbl-mariner2.0-distroless-extra-arm64v8, 8.0.3-cbl-mariner2.0-distroless-extra, 8.0-cbl-mariner2.0-distroless-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile) | CBL-Mariner 2.0-distroless 7.0.17-bookworm-slim-arm64v8, 7.0-bookworm-slim-arm64v8, 7.0.17-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 7.0.17-bullseye-slim-arm64v8, 7.0-bullseye-slim-arm64v8, 7.0.17-bullseye-slim, 7.0-bullseye-slim, 7.0.17, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 7.0.17-alpine3.18-arm64v8, 7.0-alpine3.18-arm64v8, 7.0-alpine-arm64v8, 7.0.17-alpine3.18, 7.0-alpine3.18 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/runtime/7.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18 diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml index 12027afbab..112ef96a20 100644 --- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml @@ -33,7 +33,9 @@ $(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-amd64) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-amd64) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite-amd64) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite-extra-amd64) $(McrTagsYmlTagGroup:7.0-bookworm-slim-amd64) $(McrTagsYmlTagGroup:7.0-bullseye-slim-amd64) $(McrTagsYmlTagGroup:7.0-alpine3.18-amd64) @@ -87,7 +89,9 @@ $(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite-arm64v8) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite-extra-arm64v8) $(McrTagsYmlTagGroup:7.0-bookworm-slim-arm64v8) $(McrTagsYmlTagGroup:7.0-bullseye-slim-arm64v8) $(McrTagsYmlTagGroup:7.0-alpine3.18-arm64v8) diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml index a84ef4c3de..13410e7eb5 100644 --- a/eng/mcr-tags-metadata-templates/runtime-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml @@ -21,6 +21,7 @@ $(McrTagsYmlTagGroup:8.0-jammy-chiseled-amd64) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-amd64) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-amd64) $(McrTagsYmlTagGroup:7.0-bookworm-slim-amd64) $(McrTagsYmlTagGroup:7.0-bullseye-slim-amd64) $(McrTagsYmlTagGroup:7.0-alpine3.18-amd64) @@ -62,6 +63,7 @@ $(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm64v8) $(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) $(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-arm64v8) $(McrTagsYmlTagGroup:7.0-bookworm-slim-arm64v8) $(McrTagsYmlTagGroup:7.0-bullseye-slim-arm64v8) $(McrTagsYmlTagGroup:7.0-alpine3.18-arm64v8) diff --git a/manifest.json b/manifest.json index 30236fc7c9..02f79f2e28 100644 --- a/manifest.json +++ b/manifest.json @@ -3897,6 +3897,61 @@ } ] }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|product-version)-cbl-mariner2.0-distroless-extra": {}, + "8.0-cbl-mariner2.0-distroless-extra": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra", + "os": "linux", + "osVersion": "cbl-mariner2.0-distroless", + "tags": { + "$(dotnet|8.0|product-version)-cbl-mariner2.0-distroless-extra-amd64": {}, + "8.0-cbl-mariner2.0-distroless-extra-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):8.0-cbl-mariner2.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra", + "os": "linux", + "osVersion": "cbl-mariner2.0-distroless", + "tags": { + "$(dotnet|8.0|product-version)-cbl-mariner2.0-distroless-extra-arm64v8": {}, + "8.0-cbl-mariner2.0-distroless-extra-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):8.0-cbl-mariner2.0-arm64v8" + ] + } + ] + } + ] + }, { "productVersion": "$(dotnet|8.0|product-version)", "platforms": [ @@ -6538,6 +6593,61 @@ } ] }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|product-version)-cbl-mariner2.0-distroless-extra": {}, + "8.0-cbl-mariner2.0-distroless-extra": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra", + "os": "linux", + "osVersion": "cbl-mariner2.0-distroless", + "tags": { + "$(dotnet|8.0|product-version)-cbl-mariner2.0-distroless-extra-amd64": {}, + "8.0-cbl-mariner2.0-distroless-extra-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):8.0-cbl-mariner2.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime)" + }, + "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux.extra", + "os": "linux", + "osVersion": "cbl-mariner2.0-distroless", + "tags": { + "$(dotnet|8.0|product-version)-cbl-mariner2.0-distroless-extra-arm64v8": {}, + "8.0-cbl-mariner2.0-distroless-extra-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):8.0-cbl-mariner2.0-arm64v8" + ] + } + ] + } + ] + }, { "productVersion": "$(dotnet|8.0|product-version)", "sharedTags": { @@ -6596,6 +6706,64 @@ } ] }, + { + "productVersion": "$(dotnet|8.0|product-version)", + "sharedTags": { + "$(dotnet|8.0|product-version)-cbl-mariner2.0-distroless-composite-extra": {}, + "8.0-cbl-mariner2.0-distroless-composite-extra": {}, + "8.0-cbl-mariner-distroless-composite-extra": {} + }, + "platforms": [ + { + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra", + "os": "linux", + "osVersion": "cbl-mariner2.0-distroless", + "tags": { + "$(dotnet|8.0|product-version)-cbl-mariner2.0-distroless-composite-extra-amd64": {}, + "8.0-cbl-mariner2.0-distroless-composite-extra-amd64": {}, + "8.0-cbl-mariner-distroless-composite-extra-amd64": {} + }, + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):8.0-cbl-mariner2.0-amd64" + ] + } + ] + }, + { + "architecture": "arm64", + "buildArgs": { + "REPO": "$(Repo:runtime-deps)" + }, + "dockerfile": "src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8", + "dockerfileTemplate": "eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra", + "os": "linux", + "osVersion": "cbl-mariner2.0-distroless", + "tags": { + "$(dotnet|8.0|product-version)-cbl-mariner2.0-distroless-composite-extra-arm64v8": {}, + "8.0-cbl-mariner2.0-distroless-composite-extra-arm64v8": {}, + "8.0-cbl-mariner-distroless-composite-extra-arm64v8": {} + }, + "variant": "v8", + "customBuildLegGroups": [ + { + "name": "pr-build", + "type": "Supplemental", + "dependencies": [ + "$(Repo:sdk):8.0-cbl-mariner2.0-arm64v8" + ] + } + ] + } + ] + }, { "productVersion": "$(dotnet|8.0|product-version)", "platforms": [ diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64/Dockerfile new file mode 100644 index 0000000000..bdb041d164 --- /dev/null +++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64/Dockerfile @@ -0,0 +1,38 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Composite Runtime +RUN aspnetcore_version=8.0.3 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ + && dotnet_sha512='d80104dc94afd909d424718702bdabf6d575cd24c4b6f68b83d55f6727c1c06ce5ca40a22bd7f3e7172dbea4ecaf501e44823db25cd8bc55e86768a854bd7b1a' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# ASP.NET Composite Image +FROM $REPO:8.0.3-cbl-mariner2.0-distroless-extra-amd64 + +ENV \ + # .NET Runtime version + DOTNET_VERSION=8.0.3 \ + # ASP.NET Core version + ASPNET_VERSION=8.0.3 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8/Dockerfile new file mode 100644 index 0000000000..6397dec6ec --- /dev/null +++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8/Dockerfile @@ -0,0 +1,38 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Composite Runtime +RUN aspnetcore_version=8.0.3 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ + && dotnet_sha512='e2903e3da3164d4e3d4e2f5d8202d537d79e852f382d07cd3c69cb478bdc9fcde70a482ad25002b2fba2645a2eeaa6317ca4facaacf6f49c9a0e25af41e2f740' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# ASP.NET Composite Image +FROM $REPO:8.0.3-cbl-mariner2.0-distroless-extra-arm64v8 + +ENV \ + # .NET Runtime version + DOTNET_VERSION=8.0.3 \ + # ASP.NET Core version + ASPNET_VERSION=8.0.3 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile new file mode 100644 index 0000000000..55e1dcce56 --- /dev/null +++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile @@ -0,0 +1,28 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.3 \ + && curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ + && aspnetcore_sha512='73a16e08402989f25ca780acc981c2ae3a41ef39b4bb6b6b4962053144b6eda7c175fdd5ee3c25bcd0c86a27d1a83d4f8b9b2f69f37d4e3972f5901a9e0600b6' \ + && 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.3-cbl-mariner2.0-distroless-extra-amd64 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.3 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile new file mode 100644 index 0000000000..ef720570bc --- /dev/null +++ b/src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile @@ -0,0 +1,28 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime + +# Installer image +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve ASP.NET Core +RUN aspnetcore_version=8.0.3 \ + && curl -fSL --output aspnetcore.tar.gz https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ + && aspnetcore_sha512='2ddf440be273febae8049df9b2837fe9b9d95d43a31898b915dbf39aedaf15a291ff28711e983fe099ab22a291ad244813256d57ebb6ef1fb94f04d712a96435' \ + && 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.3-cbl-mariner2.0-distroless-extra-arm64v8 + +# ASP.NET Core version +ENV ASPNET_VERSION=8.0.3 + +COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile b/src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile new file mode 100644 index 0000000000..7f43a32109 --- /dev/null +++ b/src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64/Dockerfile @@ -0,0 +1,35 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.3 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ + && dotnet_sha512='08ad7065abf73d09bd718963bd1277c4736f9d51c7c51849255732db03b59f2321d321235be8be35ca5ef2bbd4f331a0fecaefb48d3e1075659e075bcd1f0169' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# .NET runtime image +FROM $REPO:8.0.3-cbl-mariner2.0-distroless-extra-amd64 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.3 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile new file mode 100644 index 0000000000..b53b0b8ee5 --- /dev/null +++ b/src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8/Dockerfile @@ -0,0 +1,35 @@ +ARG REPO=mcr.microsoft.com/dotnet/runtime-deps + +# Installer image +FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer + +RUN tdnf install -y \ + ca-certificates \ + gzip \ + tar \ + && tdnf clean all + +# Retrieve .NET Runtime +RUN dotnet_version=8.0.3 \ + && curl -fSL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ + && dotnet_sha512='a78f51500fe180936152f561b3c2385939053aaeb1c2eba5e1353c6427a57fc1c6de8ffcc398afa0d2051ec696813b7c635917f6f0554028b725c58fda981871' \ + && echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \ + && mkdir -p /usr/share/dotnet \ + && tar -oxzf dotnet.tar.gz -C /usr/share/dotnet \ + && rm dotnet.tar.gz + +RUN mkdir /dotnet-symlink \ + && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet + + +# .NET runtime image +FROM $REPO:8.0.3-cbl-mariner2.0-distroless-extra-arm64v8 + +# .NET Runtime version +ENV DOTNET_VERSION=8.0.3 + +COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] +COPY --from=installer ["/dotnet-symlink", "/usr/bin"] + +ENTRYPOINT ["/usr/bin/dotnet"] +CMD ["--info"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index eeb895b12e..17c35a274e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -103,17 +103,21 @@ public static class TestData ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps }, new ProductImageData { Version = V8_0, OS = OS.Mariner20, Arch = Arch.Amd64 }, new ProductImageData { Version = V8_0, OS = OS.Mariner20Distroless, Arch = Arch.Amd64, SdkOS = OS.Mariner20 }, + new ProductImageData { Version = V8_0, OS = OS.Mariner20Distroless, Arch = Arch.Amd64, SdkOS = OS.Mariner20, + ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet }, new ProductImageData { Version = V8_0, OS = OS.Mariner20Distroless, Arch = Arch.Amd64, SdkOS = OS.Mariner20, ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet }, new ProductImageData { Version = V8_0, OS = OS.Mariner20Distroless, Arch = Arch.Amd64, SdkOS = OS.Mariner20, - ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps }, + ImageVariant = DotNetImageVariant.Composite | DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Aspnet }, new ProductImageData { Version = V8_0, OS = OS.Mariner20, Arch = Arch.Arm64 }, new ProductImageData { Version = V8_0, OS = OS.Mariner20Distroless, Arch = Arch.Arm64, SdkOS = OS.Mariner20 }, + new ProductImageData { Version = V8_0, OS = OS.Mariner20Distroless, Arch = Arch.Arm64, SdkOS = OS.Mariner20, + ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps | DotNetImageRepo.Runtime | DotNetImageRepo.Aspnet }, new ProductImageData { Version = V8_0, OS = OS.Mariner20Distroless, Arch = Arch.Arm64, SdkOS = OS.Mariner20, ImageVariant = DotNetImageVariant.Composite, SupportedImageRepos = DotNetImageRepo.Aspnet }, new ProductImageData { Version = V8_0, OS = OS.Mariner20Distroless, Arch = Arch.Arm64, SdkOS = OS.Mariner20, - ImageVariant = DotNetImageVariant.Extra, SupportedImageRepos = DotNetImageRepo.Runtime_Deps }, + 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.Jammy, Arch = Arch.Arm64 }, new ProductImageData { Version = V8_0, OS = OS.JammyChiseled, Arch = Arch.Arm64, SdkOS = OS.Jammy }, diff --git a/tests/performance/ImageSize.nightly.linux.json b/tests/performance/ImageSize.nightly.linux.json index eabf845b58..bcb484bceb 100644 --- a/tests/performance/ImageSize.nightly.linux.json +++ b/tests/performance/ImageSize.nightly.linux.json @@ -139,6 +139,8 @@ "src/runtime/8.0/cbl-mariner2.0/arm64v8": 177801765, "src/runtime/8.0/cbl-mariner2.0-distroless/amd64": 97946307, "src/runtime/8.0/cbl-mariner2.0-distroless/arm64v8": 97114651, + "src/runtime/8.0/cbl-mariner2.0-distroless-extra/amd64": 128681148, + "src/runtime/8.0/cbl-mariner2.0-distroless-extra/arm64v8": 131870577, "src/runtime/9.0/bookworm-slim/amd64": 193906419, "src/runtime/9.0/bookworm-slim/arm32v7": 165821014, "src/runtime/9.0/bookworm-slim/arm64v8": 222493669, @@ -249,6 +251,10 @@ "src/aspnet/8.0/cbl-mariner2.0-distroless/arm64v8": 127189267, "src/aspnet/8.0/cbl-mariner2.0-distroless-composite/amd64": 112143162, "src/aspnet/8.0/cbl-mariner2.0-distroless-composite/arm64v8": 113042002, + "src/aspnet/8.0/cbl-mariner2.0-distroless-extra/amd64": 152689059, + "src/aspnet/8.0/cbl-mariner2.0-distroless-extra/arm64v8": 158671458, + "src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/amd64": 144964230, + "src/aspnet/8.0/cbl-mariner2.0-distroless-composite-extra/arm64v8": 145470937, "src/aspnet/9.0/bookworm-slim/amd64": 217891272, "src/aspnet/9.0/bookworm-slim/arm32v7": 191294251, "src/aspnet/9.0/bookworm-slim/arm64v8": 249260740,