Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 2 additions & 6 deletions eng/dockerfile-templates/sdk/Dockerfile.envs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
VARIABLES[cat("sdk|", dotnetVersion, "|build-version")])) ^
set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
set isWindows to find(OS_VERSION, "nanoserver") >= 0 || find(OS_VERSION, "windowsservercore") >= 0 ^
set lineContinuation to when(isWindows, "`", "\") ^

set includePowerShellRollForward to dotnetVersion != "8.0" && dotnetVersion != "9.0"
set lineContinuation to when(isWindows, "`", "\")
}}ENV {{lineContinuation}}
# Do not generate certificate
DOTNET_GENERATE_ASPNET_CERTIFICATE=false {{lineContinuation}}
Expand All @@ -34,6 +32,4 @@
# Skip extraction of XML docs - generally not useful within an image/container - helps performance
NUGET_XMLDOC_MODE=skip {{if ARGS["include-powershell-vars"]:{{lineContinuation}}
# PowerShell telemetry for docker image usage
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-{{OS_ARCH_HYPHENATED}}{{if includePowerShellRollForward: {{lineContinuation}}
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major}}}}
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-{{OS_ARCH_HYPHENATED}}}}
6 changes: 3 additions & 3 deletions manifest.versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
"alpine|9.0|floating-tag-version": "$(alpine|floating-tag-version)",
"alpine|8.0|floating-tag-version": "$(alpine|floating-tag-version)",

"aspire-dashboard|build-version": "13.5.0-preview.1.26322.2",
"aspire-dashboard|build-version": "13.5.0-preview.1.26326.1",
"aspire-dashboard|product-version": "13.5.0",
"aspire-dashboard|fixed-tag": "13.5.0",
"aspire-dashboard|minor-tag": "13.5",
"aspire-dashboard|major-tag": "13",
"aspire-dashboard|linux|x64|sha": "996bfadff8f7f28b5643ca9becffb10d71f829ba9282e51b4398acf98ce2b648c59423ea1c8daabf2195e7d12e52d81a320ba76498844f828dcb12c993580023",
"aspire-dashboard|linux|arm64|sha": "9415033b29e98a4fa69f9f20e47de3cfbb7843d726bd8751741c49491978563489fd0633bcd2474df7b4373b708a552d24b20a30466a142bf661a05de84930a6",
"aspire-dashboard|linux|x64|sha": "89982edb6cff8c0370cc92b370f95f6d4fa882a00b69437febb3e85f7cdc3e01ff1c0cda0df8a64982d51a8dbfa14caeed66cdde00c7e392e2daeff8b443d93f",
"aspire-dashboard|linux|arm64|sha": "461a5edf6c0b7704a9676be2da1c54f3a7f956561abe9a3dc3d91ef00f9395f609013f615500a63b475ec7bd0f542fa6cf6c9a70b36654c7cea0fca8ce86efec",
"aspire-dashboard|base-url|main": "$(base-url|public|preview|nightly)",
"aspire-dashboard|base-url|nightly": "$(base-url|public|preview|nightly)",

Expand Down
4 changes: 2 additions & 2 deletions src/aspire-dashboard/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve Aspire Dashboard
RUN dotnet_aspire_version=13.5.0-preview.1.26322.2 \
RUN dotnet_aspire_version=13.5.0-preview.1.26326.1 \
&& curl --fail --show-error --location --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-x64.zip \
&& aspire_dashboard_sha512='996bfadff8f7f28b5643ca9becffb10d71f829ba9282e51b4398acf98ce2b648c59423ea1c8daabf2195e7d12e52d81a320ba76498844f828dcb12c993580023' \
&& aspire_dashboard_sha512='89982edb6cff8c0370cc92b370f95f6d4fa882a00b69437febb3e85f7cdc3e01ff1c0cda0df8a64982d51a8dbfa14caeed66cdde00c7e392e2daeff8b443d93f' \
&& echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \
&& mkdir --parents /app \
&& unzip aspire_dashboard.zip -d /app \
Expand Down
4 changes: 2 additions & 2 deletions src/aspire-dashboard/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve Aspire Dashboard
RUN dotnet_aspire_version=13.5.0-preview.1.26322.2 \
RUN dotnet_aspire_version=13.5.0-preview.1.26326.1 \
&& curl --fail --show-error --location --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-arm64.zip \
&& aspire_dashboard_sha512='9415033b29e98a4fa69f9f20e47de3cfbb7843d726bd8751741c49491978563489fd0633bcd2474df7b4373b708a552d24b20a30466a142bf661a05de84930a6' \
&& aspire_dashboard_sha512='461a5edf6c0b7704a9676be2da1c54f3a7f956561abe9a3dc3d91ef00f9395f609013f615500a63b475ec7bd0f542fa6cf6c9a70b36654c7cea0fca8ce86efec' \
&& echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \
&& mkdir --parents /app \
&& unzip aspire_dashboard.zip -d /app \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/alpine3.23/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ ENV \
# 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-Alpine-3.23 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.23

RUN apk add --upgrade --no-cache \
curl \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/alpine3.24/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ ENV \
# 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-Alpine-3.24 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24

RUN apk add --upgrade --no-cache \
curl \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/azurelinux3.0/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ ENV \
# 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-Azure-Linux-3.0 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0

RUN tdnf install -y \
git \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ ENV \
# 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-Azure-Linux-3.0-arm64 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64

RUN tdnf install -y \
git \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/azurelinux4.0/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ ENV \
# 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-Azure-Linux-4.0 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0

RUN dnf install -y \
git \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/azurelinux4.0/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ ENV \
# 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-Azure-Linux-4.0-arm64 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64

RUN dnf install -y \
git \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ ENV `
# 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-NanoServer-ltsc2022 `
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2022

# In order to set system PATH, ContainerAdministrator must be used
USER ContainerAdministrator
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ ENV `
# 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-NanoServer-ltsc2025 `
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025

# In order to set system PATH, ContainerAdministrator must be used
USER ContainerAdministrator
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/noble/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ENV \
# 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-Ubuntu-24.04 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/noble/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ENV \
# 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-Ubuntu-24.04-arm32 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm32

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/noble/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ENV \
# 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-Ubuntu-24.04-arm64 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm64

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/resolute/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ENV \
# 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-Ubuntu-26.04 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/resolute/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ENV \
# 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-Ubuntu-26.04-arm32 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/resolute/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ENV \
# 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-Ubuntu-26.04-arm64 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ ENV `
# 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-WindowsServerCore-ltsc2022 `
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2022

RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"

Expand Down
4 changes: 1 addition & 3 deletions src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ ENV `
# 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-WindowsServerCore-ltsc2025 `
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025

RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"

Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/alpine3.24/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ ENV \
# 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-Alpine-3.24 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24

RUN apk add --upgrade --no-cache \
curl \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/azurelinux3.0/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ ENV \
# 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-Azure-Linux-3.0 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0

RUN tdnf install -y \
git \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ ENV \
# 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-Azure-Linux-3.0-arm64 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64

RUN tdnf install -y \
git \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/azurelinux4.0/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ ENV \
# 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-Azure-Linux-4.0 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0

RUN dnf install -y \
git \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/azurelinux4.0/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ ENV \
# 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-Azure-Linux-4.0-arm64 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64

RUN dnf install -y \
git \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ ENV `
# 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-NanoServer-ltsc2025 `
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025

# In order to set system PATH, ContainerAdministrator must be used
USER ContainerAdministrator
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/resolute/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ENV \
# 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-Ubuntu-26.04 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/resolute/arm32v7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ENV \
# 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-Ubuntu-26.04-arm32 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/resolute/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ ENV \
# 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-Ubuntu-26.04-arm64 \
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
4 changes: 1 addition & 3 deletions src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ ENV `
# 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-WindowsServerCore-ltsc2025 `
# Workaround for https://github.com/PowerShell/PowerShell/issues/20685
DOTNET_ROLL_FORWARD=Major
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025

RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ public void VerifyEnvironmentVariables(ProductImageData imageData)
IEnumerable<EnvironmentVariableInfo> expectedVariables =
[
// Unset ASPNETCORE_HTTP_PORTS from base image
new EnvironmentVariableInfo("ASPNETCORE_HTTP_PORTS", string.Empty),
new EnvironmentVariableInfo("ASPNETCORE_URLS", $"{baseUrl}:{DashboardWebPort}"),
new EnvironmentVariableInfo("DOTNET_DASHBOARD_OTLP_ENDPOINT_URL", $"{baseUrl}:{DashboardOtlpPort}"),
new EnvironmentVariableInfo("DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL", $"{baseUrl}:{DashboardOtlpHttpPort}"),
new EnvironmentVariableInfo("DOTNET_DASHBOARD_MCP_ENDPOINT_URL", $"{baseUrl}:{DashboardMcpPort}"),
EnvironmentVariableInfo.Require("ASPNETCORE_HTTP_PORTS", string.Empty),
EnvironmentVariableInfo.Require("ASPNETCORE_URLS", $"{baseUrl}:{DashboardWebPort}"),
EnvironmentVariableInfo.Require("DOTNET_DASHBOARD_OTLP_ENDPOINT_URL", $"{baseUrl}:{DashboardOtlpPort}"),
EnvironmentVariableInfo.Require("DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL", $"{baseUrl}:{DashboardOtlpHttpPort}"),
EnvironmentVariableInfo.Require("DOTNET_DASHBOARD_MCP_ENDPOINT_URL", $"{baseUrl}:{DashboardMcpPort}"),
];

string imageTag = imageData.GetImage(ImageRepo, DockerHelper);
Expand Down
2 changes: 1 addition & 1 deletion tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public static EnvironmentVariableInfo GetAspnetVersionVariableInfo(
{
string version = imageData.GetProductVersion(imageRepo, DotNetImageRepo.Aspnet, dockerHelper);

return new EnvironmentVariableInfo("ASPNET_VERSION", version)
return EnvironmentVariableInfo.Require("ASPNET_VERSION", version) with
{
IsProductVersion = true
};
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading