[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
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,97 @@ | ||
| {{ | ||
| 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("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
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 |
|---|---|---|
|
|
@@ -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", new string[] { $"$DOTNET_BASE_URL/aspnetcore/Runtime/$VERSION_DIR/aspnetcore-runtime-$COMPOSITE_SUFFIX$VERSION_FILE$OPTIONAL_OS-{GetRuntimeSdkArchFormat()}.$ARCHIVE_EXT" } }, | ||
|
||
| { | ||
| "aspnet-runtime-targeting-pack", | ||
| new string[] | ||
|
|
@@ -194,6 +195,9 @@ public static IEnumerable<IDependencyUpdater> CreateUpdaters( | |
| } | ||
|
|
||
| string optionalOs = _os.Contains("rpm") ? string.Empty : $"-{_os}"; | ||
| string compositeSuffix = _dockerfileVersion.Major != 6.0 && _dockerfileVersion.Major != 7.0 && !_os.Contains("win") | ||
| ? "composite-; | ||
| : string.Empty; | ||
|
|
||
| // Each product name has one or more candidate URLs from which to retrieve the artifact. Multiple candidate URLs | ||
| // should be listed in priority order. Each subsequent URL listed is treated as a fallback. | ||
|
|
@@ -207,6 +211,7 @@ public static IEnumerable<IDependencyUpdater> CreateUpdaters( | |
| .Replace("$ARCHIVE_EXT", archiveExt) | ||
| .Replace("$VERSION_DIR", versionDir) | ||
| .Replace("$VERSION_FILE", versionFile) | ||
| .Replace("$COMPOSITE_SUFFIX", compositeSuffix) | ||
| .Replace("$OS", _os) | ||
| .Replace("$OPTIONAL_OS", optionalOs) | ||
| .Replace("$ARCH", _arch) | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
|
||
| <configuration> | ||
| <packageSources> | ||
| <clear /> | ||
| <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> | ||
| <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" /> | ||
| <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" /> | ||
| <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" /> | ||
| </packageSources> | ||
| </configuration> | ||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
Aboutsection of README.aspnet.md comes from https://github.com/dotnet/dotnet-docker/blob/nightly/eng/readme-templates/About.aspnet.md. Readmes can be regenerated from templates by runningeng\readme-templates\Get-GeneratedReadmes.ps1There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mthalman - we have a technical description of the composite format here:
https://github.com/dotnet/runtime/blob/main/docs/design/features/readytorun-composite-format-design.md
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.