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.

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 .NET 10 Dockerfiles #6161

Merged
merged 45 commits into from
Jan 27, 2025
Merged

Add .NET 10 Dockerfiles #6161

merged 45 commits into from
Jan 27, 2025

Conversation

lbussell
Copy link
Contributor

See #6070

This PR is a work in progress.

@lbussell lbussell marked this pull request as ready for review January 23, 2025 19:47
@lbussell lbussell requested a review from a team as a code owner January 23, 2025 19:47
@lbussell
Copy link
Contributor Author

Oh, the failing tests are ASP.NET Composite Runtime only. This is ASP.NET Composite runtime and non-composite .NET runtime versions are out of sync for some preview versions (#4834). It's not great, but I think we should disable those tests for now.

README.aspnet.md Outdated Show resolved Hide resolved
Comment on lines +19 to +20
set isPowerShellSupported to !(isAlpine && ARCH_SHORT != "x64") ^
set includePowerShellVars to isPowerShellSupported || dotnetVersion = "8.0" || dotnetVersion = "9.0" ^
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To me, it seems there should just be one variable. There's no point in defining variables if powershell is not being installed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason includePowerShellVars is separate is to prevent Dockerfile changes for .NET versions < 10.

Today, we include PS telemetry variables even in SDK images where we don't ship PowerShell:

# PowerShell telemetry for docker image usage
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.20-arm32

I noticed this and fixed it for .NET 10+ only because removing it could be considered a breaking change.

eng/update-dependencies/DockerfileShaUpdater.cs Outdated Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any differences in these 10.0 runtime-deps Dockerfiles compared to 9.0? If not, then we should share the Dockerfiles from 9.0.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 0f29a53

@lbussell lbussell requested a review from mthalman January 24, 2025 18:39
manifest.json Outdated Show resolved Hide resolved
@lbussell lbussell requested a review from mthalman January 27, 2025 18:10
@lbussell lbussell enabled auto-merge (squash) January 27, 2025 21:54
@lbussell lbussell merged commit 3006bec into dotnet:nightly Jan 27, 2025
121 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants