Add Windows Server 2025 Dockerfiles

dotnet · Oct 2, 2024 · c382875 · c382875
1 parent 6973f6f
commit c382875
Show file tree

Hide file tree

Showing 25 changed files with 888 additions and 22 deletions.
diff --git a/README.aspnet.md b/README.aspnet.md
@@ -203,6 +203,20 @@ Tags | Dockerfile | OS Version
 6.0.33-jammy-chiseled-extra-arm32v7, 6.0-jammy-chiseled-extra-arm32v7, 6.0.33-jammy-chiseled-extra, 6.0-jammy-chiseled-extra | [Dockerfile](src/aspnet/6.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
 6.0.33-focal-arm32v7, 6.0-focal-arm32v7, 6.0.33-focal, 6.0-focal | [Dockerfile](src/aspnet/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04
 
+### Nano Server 2025 amd64 Tags
+
+Tag | Dockerfile
+---------| ---------------
+9.0.0-rc.2-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
+8.0.8-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
+
+### Windows Server Core 2025 amd64 Tags
+
+Tag | Dockerfile
+---------| ---------------
+9.0.0-rc.2-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+8.0.8-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+
 ### Nano Server 2022 amd64 Tags
 
 Tag | Dockerfile

diff --git a/README.runtime.md b/README.runtime.md
@@ -158,6 +158,20 @@ Tags | Dockerfile | OS Version
 6.0.33-jammy-chiseled-extra-arm32v7, 6.0-jammy-chiseled-extra-arm32v7, 6.0.33-jammy-chiseled-extra, 6.0-jammy-chiseled-extra | [Dockerfile](src/runtime/6.0/jammy-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 22.04
 6.0.33-focal-arm32v7, 6.0-focal-arm32v7, 6.0.33-focal, 6.0-focal | [Dockerfile](src/runtime/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04
 
+### Nano Server 2025 amd64 Tags
+
+Tag | Dockerfile
+---------| ---------------
+9.0.0-rc.2-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
+8.0.8-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/runtime/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
+
+### Windows Server Core 2025 amd64 Tags
+
+Tag | Dockerfile
+---------| ---------------
+9.0.0-rc.2-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+8.0.8-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+
 ### Nano Server 2022 amd64 Tags
 
 Tag | Dockerfile

diff --git a/README.sdk.md b/README.sdk.md
@@ -140,6 +140,20 @@ Tags | Dockerfile | OS Version
 6.0.425-1-jammy-arm32v7, 6.0-jammy-arm32v7, 6.0.425-1-jammy, 6.0-jammy | [Dockerfile](src/sdk/6.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
 6.0.425-1-focal-arm32v7, 6.0-focal-arm32v7, 6.0.425-1-focal, 6.0-focal | [Dockerfile](src/sdk/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04
 
+### Nano Server 2025 amd64 Tags
+
+Tag | Dockerfile
+---------| ---------------
+9.0.100-rc.2-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
+8.0.402-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile)
+
+### Windows Server Core 2025 amd64 Tags
+
+Tag | Dockerfile
+---------| ---------------
+9.0.100-rc.2-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+8.0.402-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)
+
 ### Nano Server 2022 amd64 Tags
 
 Tag | Dockerfile

diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.windows b/eng/dockerfile-templates/aspnet/Dockerfile.windows
@@ -1,20 +1,36 @@
 {{
     set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
-    set baseUrl to VARIABLES[cat("dotnet|", dotnetVersion, "|base-url|", VARIABLES["branch"])] ^
-    set isInternal to find(baseUrl, "msrc") >= 0 || find(baseUrl, "internal") >= 0 ^
+    set isServerCore to find(OS_VERSION, "windowsservercore") >= 0 ^
+    set isServer2025 to find(OS_VERSION_NUMBER, "2025") >= 0 ^
+
+    set dotnetBaseUrl to VARIABLES[cat("dotnet|", dotnetVersion, "|base-url|", VARIABLES["branch"])] ^
+    set isInternal to find(dotnetBaseUrl, "msrc") >= 0 || find(dotnetBaseUrl, "internal") >= 0 ^
     set isSingleStage to (find(OS_VERSION, "windowsservercore") >= 0 && !isInternal) ^
-    set tagVersion to when(dotnetVersion = "6.0" || dotnetVersion = "8.0",
-        VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")]
-        VARIABLES[cat("dotnet|", dotnetVersion, "|fixed-tag")]) ^
-    set runtimeBaseTag to cat("$REPO:", tagVersion, "-", OS_VERSION)
+
+    set repoBaseUrl to "mcr.microsoft.com/windows" ^
+    set installerStageRepo to cat(repoBaseUrl, "/servercore") ^
+    set installerStageTag to cat(OS_VERSION_NUMBER, "-amd64") ^
+
+    set installerStageRepo to when(isServer2025,
+        cat(installerStageRepo, "/insider"),
+        installerStageRepo) ^
+    set installerStageTag to when(isServer2025,
+        VARIABLES[cat("windowsservercore|", OS_VERSION_NUMBER, "|insider|tag")],
+        installerStageTag) ^
+
+    set installerStageFromImage to cat(installerStageRepo, ":", installerStageTag) ^
+
+    set runtimeStageTag to VARIABLES[cat("dotnet|", dotnetVersion, "|fixed-tag")] ^
+    set runtimeStageFromImage to cat("$REPO:", runtimeStageTag, "-", OS_VERSION)
+
 }}# escape=`
 
 ARG REPO=mcr.microsoft.com/dotnet/runtime
 {{if isSingleStage:{{
 
     _ SINGLE STAGE
 
-}}FROM {{runtimeBaseTag}}
+}}FROM {{runtimeStageFromImage}}
 
 {{InsertTemplate("Dockerfile.envs")}}
 
@@ -24,7 +40,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
     _ MULTI STAGE
 
 }}# Installer image
-FROM mcr.microsoft.com/windows/servercore:{{OS_VERSION_NUMBER}}-amd64 AS installer
+FROM {{installerStageFromImage}} AS installer
 {{if isInternal:
 ARG SAS_QUERY_STRING
 }}
@@ -37,7 +53,7 @@ ARG SAS_QUERY_STRING
 
 
 # ASP.NET Core image
-FROM {{runtimeBaseTag}}
+FROM {{runtimeStageFromImage}}
 
 {{InsertTemplate("Dockerfile.envs")}}
 

diff --git a/eng/dockerfile-templates/runtime/Dockerfile.windows b/eng/dockerfile-templates/runtime/Dockerfile.windows
@@ -1,18 +1,39 @@
 {{
     set dotnetVersion to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
     set isServerCore to find(OS_VERSION, "windowsservercore") >= 0 ^
-    set baseUrl to VARIABLES[cat("dotnet|", dotnetVersion, "|base-url|", VARIABLES["branch"])] ^
-    set isInternal to find(baseUrl, "msrc") >= 0 || find(baseUrl, "internal") >= 0 ^
+    set isServer2025 to find(OS_VERSION_NUMBER, "2025") >= 0 ^
+
+    set dotnetBaseUrl to VARIABLES[cat("dotnet|", dotnetVersion, "|base-url|", VARIABLES["branch"])] ^
+    set isInternal to find(dotnetBaseUrl, "msrc") >= 0 || find(dotnetBaseUrl, "internal") >= 0 ^
     set isSingleStage to (find(OS_VERSION, "windowsservercore") >= 0 && !isInternal) ^
-    set serverCoreBaseTag to cat("mcr.microsoft.com/windows/servercore:", OS_VERSION_NUMBER, "-amd64") ^
-    set finalStageBaseRepo to when(isInternal && isServerCore, "servercore", "nanoserver")
+
+    set repoBaseUrl to "mcr.microsoft.com/windows" ^
+    set installerStageRepo to cat(repoBaseUrl, "/servercore") ^
+    set runtimeStageRepo to cat(repoBaseUrl, when(isServerCore, "/servercore", "/nanoserver")) ^
+
+    set fromImageTag to cat(OS_VERSION_NUMBER, "-amd64") ^
+
+    set installerStageRepo to when(isServer2025,
+        cat(installerStageRepo, "/insider"),
+        installerStageRepo) ^
+    set runtimeStageRepo to when(isServer2025,
+        cat(runtimeStageRepo, "/insider"),
+        runtimeStageRepo) ^
+
+    set fromImageTag to when(isServer2025,
+        VARIABLES[cat("windowsservercore|", OS_VERSION_NUMBER, "|insider|tag")],
+        fromImageTag) ^
+
+    set installerStageFromImage to cat(installerStageRepo, ":", fromImageTag) ^
+    set runtimeStageFromImage to cat(runtimeStageRepo, ":", fromImageTag)
+
 }}# escape=`
 
 {{if isSingleStage:{{
 
     _ SINGLE STAGE
 
-}}FROM {{serverCoreBaseTag}}
+}}FROM {{runtimeStageFromImage}}
 
 {{InsertTemplate("../Dockerfile.common-dotnet-envs")}} `
     {{InsertTemplate("Dockerfile.envs", [], "    ")}}
@@ -24,9 +45,9 @@
 else:{{
 
     _ MULTI STAGE
-    
+
 }}# Installer image
-FROM {{serverCoreBaseTag}} AS installer
+FROM {{installerStageFromImage}} AS installer
 {{if isInternal:
 ARG SAS_QUERY_STRING
 }}
@@ -40,7 +61,7 @@ ARG SAS_QUERY_STRING
 
 
 # Runtime image
-FROM mcr.microsoft.com/windows/{{finalStageBaseRepo}}:{{OS_VERSION_NUMBER}}-amd64
+FROM {{runtimeStageFromImage}}
 
 {{InsertTemplate("../Dockerfile.common-dotnet-envs")}} `
     {{InsertTemplate("Dockerfile.envs", [], "    ")}}

diff --git a/eng/dockerfile-templates/sdk/Dockerfile.windows b/eng/dockerfile-templates/sdk/Dockerfile.windows
@@ -3,10 +3,24 @@
     set baseUrl to VARIABLES[cat("dotnet|", dotnetVersion, "|base-url|", VARIABLES["branch"])] ^
     set isInternal to find(baseUrl, "msrc") >= 0 || find(baseUrl, "internal") >= 0 ^
     set isSingleStage to (find(OS_VERSION, "windowsservercore") >= 0 && !isInternal) ^
-    set tagVersion to when(dotnetVersion = "6.0" || dotnetVersion = "8.0",
-        VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")]
-        VARIABLES[cat("dotnet|", dotnetVersion, "|fixed-tag")]) ^
-    set aspnetBaseTag to cat("$REPO:", tagVersion, "-", OS_VERSION) ^
+    set isServer2025 to find(OS_VERSION_NUMBER, "2025") >= 0 ^
+
+    set repoBaseUrl to "mcr.microsoft.com/windows" ^
+    set installerStageRepo to cat(repoBaseUrl, "/servercore") ^
+    set installerStageTag to cat(OS_VERSION_NUMBER, "-amd64") ^
+
+    set installerStageRepo to when(isServer2025,
+        cat(installerStageRepo, "/insider"),
+        installerStageRepo) ^
+    set installerStageTag to when(isServer2025,
+        VARIABLES[cat("windowsservercore|", OS_VERSION_NUMBER, "|insider|tag")],
+        installerStageTag) ^
+
+    set installerStageFromImage to cat(installerStageRepo, ":", installerStageTag) ^
+
+    set aspnetTagVersion to VARIABLES[cat("dotnet|", dotnetVersion, "|fixed-tag")] ^
+    set aspnetBaseTag to cat("$REPO:", aspnetTagVersion, "-", OS_VERSION) ^
+
     set paths to when(dotnetVersion = "6.0",
         [
             "C:\Program Files\powershell",
@@ -37,7 +51,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
     _ MULTI STAGE
 
 }}# Installer image
-FROM mcr.microsoft.com/windows/servercore:{{OS_VERSION_NUMBER}}-amd64 AS installer
+FROM {{installerStageFromImage}} AS installer
 {{if isInternal:
 ARG SAS_QUERY_STRING
 }}

diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
@@ -112,6 +112,10 @@ $(McrTagsYmlTagGroup:6.0-jammy-arm32v7)
 $(McrTagsYmlTagGroup:6.0-jammy-chiseled-arm32v7)
 $(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-arm32v7)
 $(McrTagsYmlTagGroup:6.0-focal-arm32v7)
+$(McrTagsYmlTagGroup:9.0-nanoserver-ltsc2025)
+$(McrTagsYmlTagGroup:9.0-windowsservercore-ltsc2025)
+$(McrTagsYmlTagGroup:8.0-nanoserver-ltsc2025)
+$(McrTagsYmlTagGroup:8.0-windowsservercore-ltsc2025)
 $(McrTagsYmlTagGroup:9.0-nanoserver-ltsc2022)
 $(McrTagsYmlTagGroup:9.0-windowsservercore-ltsc2022)
 $(McrTagsYmlTagGroup:8.0-nanoserver-ltsc2022)

diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml
@@ -78,6 +78,10 @@ $(McrTagsYmlTagGroup:6.0-jammy-arm32v7)
 $(McrTagsYmlTagGroup:6.0-jammy-chiseled-arm32v7)
 $(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-arm32v7)
 $(McrTagsYmlTagGroup:6.0-focal-arm32v7)
+$(McrTagsYmlTagGroup:9.0-nanoserver-ltsc2025)
+$(McrTagsYmlTagGroup:9.0-windowsservercore-ltsc2025)
+$(McrTagsYmlTagGroup:8.0-nanoserver-ltsc2025)
+$(McrTagsYmlTagGroup:8.0-windowsservercore-ltsc2025)
 $(McrTagsYmlTagGroup:9.0-nanoserver-ltsc2022)
 $(McrTagsYmlTagGroup:9.0-windowsservercore-ltsc2022)
 $(McrTagsYmlTagGroup:8.0-nanoserver-ltsc2022)

diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml
@@ -58,6 +58,10 @@ $(McrTagsYmlTagGroup:6.0-bullseye-slim-arm32v7)
 $(McrTagsYmlTagGroup:6.0-alpine3.20-arm32v7)
 $(McrTagsYmlTagGroup:6.0-jammy-arm32v7)
 $(McrTagsYmlTagGroup:6.0-focal-arm32v7)
+$(McrTagsYmlTagGroup:9.0-nanoserver-ltsc2025)
+$(McrTagsYmlTagGroup:9.0-windowsservercore-ltsc2025)
+$(McrTagsYmlTagGroup:8.0-nanoserver-ltsc2025)
+$(McrTagsYmlTagGroup:8.0-windowsservercore-ltsc2025)
 $(McrTagsYmlTagGroup:9.0-nanoserver-ltsc2022)
 $(McrTagsYmlTagGroup:9.0-windowsservercore-ltsc2022)
 $(McrTagsYmlTagGroup:8.0-nanoserver-ltsc2022)