Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Ubuntu Chiseled extra images for Runtime and ASP.NET Core #5028

Merged
merged 14 commits into from
Nov 29, 2023
Merged

Add Ubuntu Chiseled extra images for Runtime and ASP.NET Core #5028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9266adf
Add chiseled extra image for runtime
lbussell Nov 21, 2023
48c994b
Add chiseled extra images for aspnet and aspnet composite
lbussell Nov 22, 2023
f40d3ae
Use separate Dockerfiles and update readmes
lbussell Nov 27, 2023
1a99037
Remove unused build args
lbussell Nov 27, 2023
5cd236d
Update docs
lbussell Nov 28, 2023
055929c
Add placeholder image sizes
lbussell Nov 28, 2023
b6d8e3d
Check packages installed for aspnet and runtime images
lbussell Nov 28, 2023
48d2170
Fix ImageVariant name for multiple flags
lbussell Nov 29, 2023
feeda5d
Don't worry about dotnet packages in syft
lbussell Nov 29, 2023
4973c8e
Update docs based on code review
lbussell Nov 29, 2023
15d12b1
Update templates based on code review
lbussell Nov 29, 2023
c83d14e
Update documentation based on code review
lbussell Nov 29, 2023
705ae5a
Remove one more unused template variable
lbussell Nov 29, 2023
13008ee
Add another comment to syft args
lbussell Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.aspnet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ Tags | Dockerfile | OS Version
8.0.0-alpine3.18-composite-amd64, 8.0-alpine3.18-composite-amd64, 8.0-alpine-composite-amd64, 8.0.0-alpine3.18-composite, 8.0-alpine3.18-composite, 8.0-alpine-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/alpine3.18-composite/amd64/Dockerfile) | Alpine 3.18
8.0.0-jammy-amd64, 8.0-jammy-amd64, 8.0.0-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.0-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.0-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-composite-amd64, 8.0-jammy-chiseled-composite-amd64, 8.0.0-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled-composite/amd64/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-composite-extra-amd64, 8.0-jammy-chiseled-composite-extra-amd64, 8.0.0-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 22.04
7.0.14-bookworm-slim-amd64, 7.0-bookworm-slim-amd64, 7.0.14-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/7.0/bookworm-slim/amd64/Dockerfile) | Debian 12
7.0.14-bullseye-slim-amd64, 7.0-bullseye-slim-amd64, 7.0.14-bullseye-slim, 7.0-bullseye-slim, 7.0.14, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/7.0/bullseye-slim/amd64/Dockerfile) | Debian 11
7.0.14-alpine3.18-amd64, 7.0-alpine3.18-amd64, 7.0-alpine-amd64, 7.0.14-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/7.0/alpine3.18/amd64/Dockerfile) | Alpine 3.18
Expand All @@ -103,7 +105,9 @@ Tags | Dockerfile | OS Version
8.0.0-alpine3.18-composite-arm64v8, 8.0-alpine3.18-composite-arm64v8, 8.0-alpine-composite-arm64v8, 8.0.0-alpine3.18-composite, 8.0-alpine3.18-composite, 8.0-alpine-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/alpine3.18-composite/arm64v8/Dockerfile) | Alpine 3.18
8.0.0-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.0-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.0-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.0-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-composite-arm64v8, 8.0-jammy-chiseled-composite-arm64v8, 8.0.0-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-composite-extra-arm64v8, 8.0-jammy-chiseled-composite-extra-arm64v8, 8.0.0-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 22.04
7.0.14-bookworm-slim-arm64v8, 7.0-bookworm-slim-arm64v8, 7.0.14-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/7.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
7.0.14-bullseye-slim-arm64v8, 7.0-bullseye-slim-arm64v8, 7.0.14-bullseye-slim, 7.0-bullseye-slim, 7.0.14, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/7.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11
7.0.14-alpine3.18-arm64v8, 7.0-alpine3.18-arm64v8, 7.0-alpine-arm64v8, 7.0.14-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/7.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18
Expand All @@ -124,7 +128,9 @@ Tags | Dockerfile | OS Version
8.0.0-alpine3.18-composite-arm32v7, 8.0-alpine3.18-composite-arm32v7, 8.0-alpine-composite-arm32v7, 8.0.0-alpine3.18-composite, 8.0-alpine3.18-composite, 8.0-alpine-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/alpine3.18-composite/arm32v7/Dockerfile) | Alpine 3.18
8.0.0-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.0-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.0-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.0-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-composite-arm32v7, 8.0-jammy-chiseled-composite-arm32v7, 8.0.0-jammy-chiseled-composite, 8.0-jammy-chiseled-composite | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-composite-extra-arm32v7, 8.0-jammy-chiseled-composite-extra-arm32v7, 8.0.0-jammy-chiseled-composite-extra, 8.0-jammy-chiseled-composite-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/8.0/jammy-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 22.04
7.0.14-bookworm-slim-arm32v7, 7.0-bookworm-slim-arm32v7, 7.0.14-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/7.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
7.0.14-bullseye-slim-arm32v7, 7.0-bullseye-slim-arm32v7, 7.0.14-bullseye-slim, 7.0-bullseye-slim, 7.0.14, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/7.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11
7.0.14-alpine3.18-arm32v7, 7.0-alpine3.18-arm32v7, 7.0-alpine-arm32v7, 7.0.14-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/aspnet/7.0/alpine3.18/arm32v7/Dockerfile) | Alpine 3.18
Expand Down
3 changes: 3 additions & 0 deletions README.runtime.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Tags | Dockerfile | OS Version
8.0.0-alpine3.18-amd64, 8.0-alpine3.18-amd64, 8.0-alpine-amd64, 8.0.0-alpine3.18, 8.0-alpine3.18, 8.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/alpine3.18/amd64/Dockerfile) | Alpine 3.18
8.0.0-jammy-amd64, 8.0-jammy-amd64, 8.0.0-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/jammy/amd64/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-amd64, 8.0-jammy-chiseled-amd64, 8.0.0-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-extra-amd64, 8.0-jammy-chiseled-extra-amd64, 8.0.0-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04
7.0.14-bookworm-slim-amd64, 7.0-bookworm-slim-amd64, 7.0.14-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/7.0/bookworm-slim/amd64/Dockerfile) | Debian 12
7.0.14-bullseye-slim-amd64, 7.0-bullseye-slim-amd64, 7.0.14-bullseye-slim, 7.0-bullseye-slim, 7.0.14, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/7.0/bullseye-slim/amd64/Dockerfile) | Debian 11
7.0.14-alpine3.18-amd64, 7.0-alpine3.18-amd64, 7.0-alpine-amd64, 7.0.14-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/7.0/alpine3.18/amd64/Dockerfile) | Alpine 3.18
Expand All @@ -89,6 +90,7 @@ Tags | Dockerfile | OS Version
8.0.0-alpine3.18-arm64v8, 8.0-alpine3.18-arm64v8, 8.0-alpine-arm64v8, 8.0.0-alpine3.18, 8.0-alpine3.18, 8.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18
8.0.0-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.0-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-arm64v8, 8.0-jammy-chiseled-arm64v8, 8.0.0-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/jammy-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-extra-arm64v8, 8.0-jammy-chiseled-extra-arm64v8, 8.0.0-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/jammy-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 22.04
7.0.14-bookworm-slim-arm64v8, 7.0-bookworm-slim-arm64v8, 7.0.14-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/7.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
7.0.14-bullseye-slim-arm64v8, 7.0-bullseye-slim-arm64v8, 7.0.14-bullseye-slim, 7.0-bullseye-slim, 7.0.14, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/7.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11
7.0.14-alpine3.18-arm64v8, 7.0-alpine3.18-arm64v8, 7.0-alpine-arm64v8, 7.0.14-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/7.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18
Expand All @@ -108,6 +110,7 @@ Tags | Dockerfile | OS Version
8.0.0-alpine3.18-arm32v7, 8.0-alpine3.18-arm32v7, 8.0-alpine-arm32v7, 8.0.0-alpine3.18, 8.0-alpine3.18, 8.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/alpine3.18/arm32v7/Dockerfile) | Alpine 3.18
8.0.0-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.0-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-arm32v7, 8.0-jammy-chiseled-arm32v7, 8.0.0-jammy-chiseled, 8.0-jammy-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/jammy-chiseled/arm32v7/Dockerfile) | Ubuntu 22.04
8.0.0-jammy-chiseled-extra-arm32v7, 8.0-jammy-chiseled-extra-arm32v7, 8.0.0-jammy-chiseled-extra, 8.0-jammy-chiseled-extra | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/8.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
7.0.14-bookworm-slim-arm32v7, 7.0-bookworm-slim-arm32v7, 7.0.14-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/7.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
7.0.14-bullseye-slim-arm32v7, 7.0-bullseye-slim-arm32v7, 7.0.14-bullseye-slim, 7.0-bullseye-slim, 7.0.14, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/7.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11
7.0.14-alpine3.18-arm32v7, 7.0-alpine3.18-arm32v7, 7.0-alpine-arm32v7, 7.0.14-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/runtime/7.0/alpine3.18/arm32v7/Dockerfile) | Alpine 3.18
Expand Down
4 changes: 2 additions & 2 deletions documentation/image-variants.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ For more information, see the [Ubuntu Chiseled .NET Containers documentation](./

### `extra` (.NET 8.0+)

The `extra` image variant is offered for Linux alongside our size-focused base images for [self-contained](https://learn.microsoft.com/dotnet/core/deploying/#publish-self-contained) apps that depend on globalization functionality.
Extra images contain everything that the default images do, plus `icu` and `tzdata`.
For apps that depend on globalization functionality, the `extra` image variant is offered for [Ubuntu Chiseled](./ubuntu-chiseled.md) `runtime-deps`, `runtime`, and `aspnet` images as well as `runtime-deps` images for Alpine Linux and CBL Mariner distroless.
These `extra` images contain everything that the default images do, plus `icu` and `tzdata`.

### `composite` (.NET 8.0+)

Expand Down
4 changes: 3 additions & 1 deletion documentation/ubuntu-chiseled.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ Our Chiseled images are focused on size. That means the default Chiseled images
libraries from Ubuntu. However, we offer an `extra` image variant that includes `tzdata` and `icu` by default. You can
use this in place of the default chiseled image by appending the `-extra` suffix to the image tag like so:

- `8.0-jammy-chiseled-extra`
- `mcr.microsoft.com/dotnet/runtime-deps:8.0-jammy-chiseled-extra`
- `mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled-extra`
- `mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled-extra`

Please see ["Announcement: New approach for differentiating .NET 8+ images"](https://github.com/dotnet/dotnet-docker/discussions/4821) for more info.

Expand Down
7 changes: 6 additions & 1 deletion eng/dockerfile-templates/aspnet/Dockerfile.linux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{{
_ ARGS:
is-extra (optional): Whether to include extra packages that are not needed for every app,
for example globalization support ^

set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
set isMariner to find(OS_VERSION, "mariner") >= 0 ^
Expand All @@ -9,8 +13,9 @@
set isInternal to find(baseUrl, "msrc") >= 0 || find(baseUrl, "internal") >= 0 ^
set isRpmInstall to isFullMariner && dotnetVersion = "6.0" ^
set isSingleStage to (isAlpine || isRpmInstall) && !isInternal ^
set runtimeDepsVariant to when(ARGS["is-extra"], "-extra", "") ^
set runtimeBaseTag to
cat("$REPO:", VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
cat("$REPO:", VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], "-", OS_VERSION, runtimeDepsVariant, ARCH_TAG_SUFFIX) ^
set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
set installerImageTag to when(isDistrolessMariner,
Expand Down
3 changes: 2 additions & 1 deletion eng/dockerfile-templates/aspnet/Dockerfile.linux-composite
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
set baseUrl to VARIABLES[cat("base-url|", dotnetVersion, "|", VARIABLES["branch"])] ^
set isInternal to find(baseUrl, "msrc") >= 0 || find(baseUrl, "internal") >= 0 ^
set isSingleStage to isAlpine && !isInternal ^
set runtimeDepsVariant to when(ARGS["is-extra"], "-extra", "") ^
set runtimeDepsBaseTag to
cat("$REPO:", VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
cat("$REPO:", VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], "-", OS_VERSION, runtimeDepsVariant, ARCH_TAG_SUFFIX) ^
set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
set installerImageTag to when(isDistrolessMariner,
cat("mcr.microsoft.com/cbl-mariner/base/core:", OS_VERSION_NUMBER),
Expand Down
1 change: 1 addition & 0 deletions eng/dockerfile-templates/aspnet/Dockerfile.linux-composite.extra
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{InsertTemplate("Dockerfile.linux-composite", [ "is-extra": "true" ])}}
1 change: 1 addition & 0 deletions eng/dockerfile-templates/aspnet/Dockerfile.linux.extra
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{InsertTemplate("Dockerfile.linux", [ "is-extra": "true" ])}}
7 changes: 6 additions & 1 deletion eng/dockerfile-templates/runtime/Dockerfile.linux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{{
_ ARGS:
is-extra (optional): Whether to include extra packages that are not needed for every app,
for example globalization support ^

set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
set isMariner to find(OS_VERSION, "mariner") >= 0 ^
Expand All @@ -9,8 +13,9 @@
set isInternal to find(baseUrl, "msrc") >= 0 || find(baseUrl, "internal") >= 0 ^
set isRpmInstall to isFullMariner && dotnetVersion = "6.0" ^
set isSingleStage to (isAlpine || isRpmInstall) && !isInternal ^
set runtimeDepsVariant to when(ARGS["is-extra"], "-extra", "") ^
set runtimeDepsBaseTag to cat(
"$REPO:", VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
"$REPO:", VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], "-", OS_VERSION, runtimeDepsVariant, ARCH_TAG_SUFFIX) ^
set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
set installerImageTag to when(isDistrolessMariner,
cat("mcr.microsoft.com/cbl-mariner/base/core:", OS_VERSION_NUMBER),
Expand Down
1 change: 1 addition & 0 deletions eng/dockerfile-templates/runtime/Dockerfile.linux.extra
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{InsertTemplate("Dockerfile.linux", [ "is-extra": "true" ])}}
6 changes: 6 additions & 0 deletions eng/mcr-tags-metadata-templates/aspnet-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ $(McrTagsYmlTagGroup:8.0-alpine3.18-amd64)
$(McrTagsYmlTagGroup:8.0-alpine3.18-composite-amd64)
$(McrTagsYmlTagGroup:8.0-jammy-amd64)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-amd64)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-amd64)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-amd64)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-amd64)
$(McrTagsYmlTagGroup:7.0-bookworm-slim-amd64)
$(McrTagsYmlTagGroup:7.0-bullseye-slim-amd64)
$(McrTagsYmlTagGroup:7.0-alpine3.18-amd64)
Expand All @@ -21,7 +23,9 @@ $(McrTagsYmlTagGroup:8.0-alpine3.18-arm64v8)
$(McrTagsYmlTagGroup:8.0-alpine3.18-composite-arm64v8)
$(McrTagsYmlTagGroup:8.0-jammy-arm64v8)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm64v8)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm64v8)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-arm64v8)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-arm64v8)
$(McrTagsYmlTagGroup:7.0-bookworm-slim-arm64v8)
$(McrTagsYmlTagGroup:7.0-bullseye-slim-arm64v8)
$(McrTagsYmlTagGroup:7.0-alpine3.18-arm64v8)
Expand All @@ -38,7 +42,9 @@ $(McrTagsYmlTagGroup:8.0-alpine3.18-arm32v7)
$(McrTagsYmlTagGroup:8.0-alpine3.18-composite-arm32v7)
$(McrTagsYmlTagGroup:8.0-jammy-arm32v7)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm32v7)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm32v7)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-arm32v7)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-arm32v7)
$(McrTagsYmlTagGroup:7.0-bookworm-slim-arm32v7)
$(McrTagsYmlTagGroup:7.0-bullseye-slim-arm32v7)
$(McrTagsYmlTagGroup:7.0-alpine3.18-arm32v7)
Expand Down
3 changes: 3 additions & 0 deletions eng/mcr-tags-metadata-templates/runtime-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ $(McrTagsYmlTagGroup:8.0-bookworm-slim-amd64)
$(McrTagsYmlTagGroup:8.0-alpine3.18-amd64)
$(McrTagsYmlTagGroup:8.0-jammy-amd64)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-amd64)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-amd64)
$(McrTagsYmlTagGroup:7.0-bookworm-slim-amd64)
$(McrTagsYmlTagGroup:7.0-bullseye-slim-amd64)
$(McrTagsYmlTagGroup:7.0-alpine3.18-amd64)
Expand All @@ -18,6 +19,7 @@ $(McrTagsYmlTagGroup:8.0-bookworm-slim-arm64v8)
$(McrTagsYmlTagGroup:8.0-alpine3.18-arm64v8)
$(McrTagsYmlTagGroup:8.0-jammy-arm64v8)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm64v8)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm64v8)
$(McrTagsYmlTagGroup:7.0-bookworm-slim-arm64v8)
$(McrTagsYmlTagGroup:7.0-bullseye-slim-arm64v8)
$(McrTagsYmlTagGroup:7.0-alpine3.18-arm64v8)
Expand All @@ -33,6 +35,7 @@ $(McrTagsYmlTagGroup:8.0-bookworm-slim-arm32v7)
$(McrTagsYmlTagGroup:8.0-alpine3.18-arm32v7)
$(McrTagsYmlTagGroup:8.0-jammy-arm32v7)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm32v7)
$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm32v7)
$(McrTagsYmlTagGroup:7.0-bookworm-slim-arm32v7)
$(McrTagsYmlTagGroup:7.0-bullseye-slim-arm32v7)
$(McrTagsYmlTagGroup:7.0-alpine3.18-arm32v7)
Expand Down
Loading
Loading