[Fixed] - Add Dockerfiles for Linux .NET Composite Images #4594
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Member
There was a problem hiding this comment. We should really have some sort of documentation that describes the purpose of these composite images (i.e. what are they? how do they differ from the regular aspnet images? how do I determine which one to use?). If necessary, this can link to another doc page that describes things in more detail. Note that the Docker repository readmes are generated from templates. For example, the
Member
There was a problem hiding this comment. @mthalman - we have a technical description of the composite format here: In terms of our current shipping story the composite container is a tool a customer can use to reduce container size on disk while keeping performance of default R2R publishing with the caveat that the composite container has tighter version coupling - in particular, the final app is not allowed to use handpicked custom versions of framework / ASP.NET assemblies that are baked into the composite image. @ivdiazsa - please let me know if you need further help with the actual wording. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,7 +59,7 @@ if ($SdkVersion) { | |
| } | ||
|
|
||
| if ($AspnetVersion) { | ||
| $updateDepsArgs += @("--product-version", "aspnet=$AspnetVersion", "--product-version", "aspnet-runtime-targeting-pack=$AspnetVersion", "--product-version", "aspnet-composite=$AspnetVersion") | ||
| } | ||
|
|
||
| if ($RuntimeVersion) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| {{ | ||
| 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 ^ | ||
| set isDistroless to find(OS_VERSION, "distroless") >= 0 || find(OS_VERSION, "chiseled") >= 0 ^ | ||
| set isFullMariner to isMariner && !isDistroless ^ | ||
| set isDistrolessMariner to isMariner && isDistroless ^ | ||
| set baseUrl to VARIABLES[cat("base-url|", dotnetVersion, "|", VARIABLES["branch"])] ^ | ||
| set isInternal to find(baseUrl, "msrc") >= 0 || find(baseUrl, "internal") >= 0 ^ | ||
| set isRpmInstall to false ^ | ||
| set isSingleStage to (isAlpine || isRpmInstall) && !isInternal ^ | ||
| set runtimeDepsBaseTag to | ||
| cat("$REPO:", VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], "-", OS_VERSION, 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), | ||
| when(isAlpine || isFullMariner, | ||
| runtimeDepsBaseTag, | ||
| cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl"))) | ||
| }}ARG REPO=mcr.microsoft.com/dotnet/runtime-deps{{ if isSingleStage: | ||
| {{ | ||
|
|
||
| _ SINGLE STAGE | ||
|
Member
There was a problem hiding this comment. I would just like to note that there are unused options in this file but we should leave them for if we decide to ship non-musl variants of composite images in the future. |
||
|
|
||
| }}FROM {{runtimeDepsBaseTag}} | ||
| {{ if isAlpine: | ||
| {{InsertTemplate("../Dockerfile.alpine.invariant-mode")}} | ||
| }} | ||
| {{InsertTemplate("../runtime/Dockerfile.envs")}} | ||
| {{InsertTemplate("Dockerfile.envs")}} | ||
|
|
||
| # Install ASP.NET Composite Runtime | ||
| {{InsertTemplate("../runtime/Dockerfile.linux.install-runtime", | ||
| [ | ||
| "install-method": "download-and-install", | ||
| "dest-dir": "/usr/share/dotnet", | ||
| "add-symlink": !isRpmInstall, | ||
| "is-rpm-install": isRpmInstall, | ||
| "is-composite-runtime": "true", | ||
| ])}}^ | ||
| else:{{ | ||
|
|
||
| _ MULTI STAGE | ||
|
|
||
| }} | ||
|
|
||
| # Installer image | ||
| FROM {{installerImageTag}} AS installer | ||
| {{ if isInternal: | ||
| ARG SAS_QUERY_STRING | ||
| }}{{ if isDistrolessMariner: | ||
| {{InsertTemplate("../Dockerfile.linux.distroless-mariner-installer-prereqs")}} | ||
| ^elif isFullMariner && !isRpmInstall: | ||
| RUN {{InsertTemplate("../Dockerfile.linux.install-pkgs", | ||
| [ | ||
| "pkgs": ["tar"] | ||
| ])}} | ||
| }} | ||
|
|
||
| # Retrieve ASP.NET Composite Runtime | ||
| {{InsertTemplate("../runtime/Dockerfile.linux.install-runtime", | ||
| [ | ||
| "install-method": when(isInternal && isRpmInstall, "download", "download-and-install"), | ||
| "use-local-version-var": "true", | ||
| "dest-dir": when(isDistroless, "/usr/share/dotnet", "/dotnet"), | ||
| "is-internal": isInternal, | ||
| "url-suffix": when(isInternal, "$SAS_QUERY_STRING", ""), | ||
| "is-rpm-install": isRpmInstall, | ||
| "is-composite-runtime": "true" | ||
| ])}}{{ if isDistroless: | ||
|
|
||
| RUN mkdir /dotnet-symlink \ | ||
| && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet}} | ||
|
|
||
| # ASP.NET Composite Runtime Image | ||
| FROM {{runtimeDepsBaseTag}} | ||
|
|
||
| {{InsertTemplate("../runtime/Dockerfile.envs")}} | ||
| {{InsertTemplate("Dockerfile.envs")}} | ||
| {{ if isInternal && isRpmInstall: | ||
| {{InsertTemplate("Dockerfile.linux.install-runtime", | ||
| [ | ||
| "install-method": "copy-and-install", | ||
| "dest-dir": when(isDistroless, "/usr/share/dotnet", "/dotnet"), | ||
| "is-internal": isInternal, | ||
| "url-suffix": when(isInternal, "$SAS_QUERY_STRING", ""), | ||
| "installer-stage": "installer", | ||
| "is-rpm-install": isRpmInstall | ||
| ])}}}}{{ if isDistroless: | ||
| COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] | ||
| COPY --from=installer ["/dotnet-symlink", "/usr/bin"]{{ if !isMariner || dotnetVersion != "6.0": | ||
|
|
||
| ENTRYPOINT ["/usr/bin/dotnet"] | ||
| CMD ["--info"]}}^ | ||
| elif !(isInternal && isRpmInstall): | ||
| COPY --from=installer ["/dotnet", "/usr/share/dotnet"] | ||
| RUN {{InsertTemplate("../runtime/Dockerfile.linux.symlink")}}}}}} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,8 @@ | |
| is-internal (optional): Whether the Dockerfile is targeting an internal build of the product. | ||
| url-suffix (optional): Suffix string to append the end of the URL. | ||
| installer-stage (optional): Name of the Dockerfile stage responsible for installation | ||
| is-rpm-install (optional): Whether to install RPM versus tarball | ||
| is-composite-runtime (optional): Whether to install aspnetcore composite version ^ | ||
|
|
||
| set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^ | ||
| set isAlpine to find(OS_VERSION, "alpine") >= 0 ^ | ||
|
|
@@ -19,15 +20,30 @@ | |
| when(ARGS["is-internal"], | ||
| VARIABLES[cat("runtime|", dotnetVersion, "|build-version")], | ||
| "$DOTNET_VERSION")) ^ | ||
| set aspnetCompositeVersionDir to when(ARGS["use-local-version-var"], | ||
| "$aspnetcore_version", | ||
| when(ARGS["is-internal"], | ||
| VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")], | ||
| "$ASPNET_VERSION")) ^ | ||
| set isInternalStableBranding to ARGS["is-internal"] && | ||
| (find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-servicing") >= 0 || | ||
| find(VARIABLES[cat("sdk|", dotnetVersion, "|build-version")], "-rtm") >= 0) ^ | ||
| set runtimeVersionFile to when(isInternalStableBranding, | ||
| VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], | ||
| runtimeVersionDir) ^ | ||
| set aspnetCompositeVersionFile to when(isInternalStableBranding, | ||
| VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], | ||
| aspnetCompositeVersionDir) ^ | ||
| set fileArch to when(ARGS["is-rpm-install"] && ARCH_SHORT = "arm64", "aarch64", ARCH_SHORT) ^ | ||
| set fileExt to when(ARGS["is-rpm-install"], "rpm", "tar.gz") ^ | ||
| set filePlatform to when(ARGS["is-rpm-install"], "", when(isAlpine, "-linux-musl", "-linux")) ^ | ||
| set baseUrl to VARIABLES[cat("base-url|", dotnetVersion, "|", VARIABLES["branch"])] ^ | ||
| set runtimeBaseUrl to cat(baseUrl, "/Runtime/", runtimeVersionDir, "/") ^ | ||
| set aspnetCompositeUrl to cat(baseUrl, "/aspnetcore/Runtime/", aspnetCompositeVersionDir, "/aspnetcore-runtime-composite-", aspnetCompositeVersionFile, | ||
| filePlatform, "-", fileArch, ".", fileExt, ARGS["url-suffix"]) ^ | ||
| set localVersionVar to when(ARGS["is-composite-runtime"], | ||
| VARIABLES[cat("runtime|", dotnetVersion, "|build-version")], | ||
| VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")]) ^ | ||
| set rpmFileArch to when(ARCH_SHORT = "arm64", "aarch64", ARCH_SHORT) ^ | ||
| set rpms to [ | ||
| [ | ||
|
|
@@ -49,15 +65,24 @@ | |
| "sha-var-name": "dotnet_sha512" | ||
| ] | ||
| ] ^ | ||
| set tarballs to when(ARGS["is-composite-runtime"], | ||
| [ | ||
| [ | ||
| "filename": "dotnet.tar.gz", | ||
| "url": aspnetCompositeUrl, | ||
| "sha": VARIABLES[join(["aspnet-composite", dotnetVersion, varPlatform, ARCH_SHORT, "sha"], "|")], | ||
| "sha-var-name": "dotnet_sha512" | ||
| ] | ||
| ], | ||
| [ | ||
| [ | ||
| "filename": "dotnet.tar.gz", | ||
| "url": cat(runtimeBaseUrl, "dotnet-runtime-", runtimeVersionFile, "-", varPlatform, "-", ARCH_SHORT, ".tar.gz", | ||
| ARGS["url-suffix"]), | ||
| "sha": VARIABLES[join(["runtime", dotnetVersion, varPlatform, ARCH_SHORT, "sha"], "|")], | ||
| "sha-var-name": "dotnet_sha512" | ||
| ] | ||
| ]) ^ | ||
| set files to when(ARGS["is-rpm-install"], rpms, tarballs) ^ | ||
| set copyEnabled to ARGS["install-method"] = "copy-and-install" ^ | ||
| set downloadEnabled to ARGS["install-method"] = "download" || ARGS["install-method"] = "download-and-install" ^ | ||
|
|
@@ -70,7 +95,8 @@ if copyEnabled:{{InsertTemplate("../Dockerfile.linux.copy-files", | |
| "destination": "" | ||
| ]) | ||
| }} | ||
| }}RUN {{if ARGS["use-local-version-var"]:{{ if ARGS["is-composite-runtime"]:aspnetcore_version={{VARIABLES[cat("aspnet|", dotnetVersion, "|buildVersion")]}} ^ | ||
| else:dotnet_version={{VARIABLES[cat("runtime|", dotnetVersion, "|build-version")]}}}} \ | ||
| && }}{{InsertTemplate("../Dockerfile.linux.download-and-install", | ||
| [ | ||
| "files": files, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,8 @@ $(McrTagsYmlTagGroup:8.0-preview-bookworm-slim-amd64) | |
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-alpine3.17-amd64) | ||
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-alpine3.17-composite-amd64) | ||
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-jammy-amd64) | ||
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-jammy-chiseled-amd64) | ||
|
|
@@ -20,6 +22,8 @@ $(McrTagsYmlTagGroup:8.0-preview-bookworm-slim-arm64v8) | |
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-alpine3.17-arm64v8) | ||
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-alpine3.17-composite-arm64v8) | ||
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-jammy-arm64v8) | ||
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-jammy-chiseled-arm64v8) | ||
|
|
@@ -37,6 +41,8 @@ $(McrTagsYmlTagGroup:8.0-preview-bookworm-slim-arm32v7) | |
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-alpine3.17-arm32v7) | ||
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-alpine3.17-composite-arm32v7) | ||
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-jammy-arm32v7) | ||
| customSubTableTitle: .NET 8 Preview Tags | ||
| $(McrTagsYmlTagGroup:8.0-preview-jammy-chiseled-arm32v7) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,7 @@ | ||
| This image contains the ASP.NET Core and .NET runtimes and libraries and is optimized for running ASP.NET Core apps in production. | ||
|
|
||
| {{ARGS["top-header"]}}# Composite container images | ||
|
|
||
| Starting from .NET 8, a composite version of the ASP.NET images, `denoted with the -composite` tag part, is being offered alongside the regular image. The main characteristics of these images are their smaller size on disk while keeping the performance of the default [ReadyToRun (R2R) setting](https://learn.microsoft.com/dotnet/core/deploying/ready-to-run). The caveat is that the composite images have tighter version coupling. This means the final app run on them cannot use handpicked custom versions of the framework and/or ASP.NET assemblies that are built into the composite binary. | ||
|
|
||
| For a full technical description on how the composites work, we have a [feature doc here](https://github.com/dotnet/runtime/blob/main/docs/design/features/readytorun-composite-format-design.md). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -86,6 +86,7 @@ public DockerfileShaUpdater( | |
| { "runtime-deps-cm.2", new string[] { $"$DOTNET_BASE_URL/Runtime/$VERSION_DIR/dotnet-runtime-deps-$VERSION_FILE-cm.2-{GetRpmArchFormat()}.$ARCHIVE_EXT" } }, | ||
|
|
||
| { "aspnet", new string[] { $"$DOTNET_BASE_URL/aspnetcore/Runtime/$VERSION_DIR/aspnetcore-runtime-$VERSION_FILE$OPTIONAL_OS-{GetRuntimeSdkArchFormat()}.$ARCHIVE_EXT" } }, | ||
| { "aspnet-composite", new string[] { $"$DOTNET_BASE_URL/aspnetcore/Runtime/$VERSION_DIR/aspnetcore-runtime-composite-$VERSION_FILE$OPTIONAL_OS-{GetRuntimeSdkArchFormat()}.$ARCHIVE_EXT" } }, | ||
| { | ||
| "aspnet-runtime-targeting-pack", | ||
| new string[] | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.