Skip to content

Commit 4f762e8

Browse files
lbusselllbussell
committed
Add Dockerfiles for Windows Server 2025
1 parent e2016aa commit 4f762e8

File tree

19 files changed

+441
-14
lines changed

19 files changed

+441
-14
lines changed

‎README.aspnet.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@ Version Tag | OS Version | Supported .NET Versions
6969

7070
## Full Tag Listing
7171

72+
### Windows Server Core 2025 amd64 Tags
73+
74+
Tag | Dockerfile
75+
---------| ---------------
76+
4.8.1-20241024-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/aspnet/4.8.1/windowsservercore-ltsc2025/Dockerfile)
77+
3.5-20241024-windowsservercore-ltsc2025, 3.5-windowsservercore-ltsc2025, 3.5 | [Dockerfile](src/aspnet/3.5/windowsservercore-ltsc2025/Dockerfile)
78+
7279
### Windows Server Core 2022 amd64 Tags
7380

7481
Tag | Dockerfile

‎README.runtime.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ Version Tag | OS Version | Supported .NET Versions
6060

6161
## Full Tag Listing
6262

63+
### Windows Server Core 2025 amd64 Tags
64+
65+
Tag | Dockerfile
66+
---------| ---------------
67+
4.8.1-20241024-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/runtime/4.8.1/windowsservercore-ltsc2025/Dockerfile)
68+
3.5-20241024-windowsservercore-ltsc2025, 3.5-windowsservercore-ltsc2025, 3.5 | [Dockerfile](src/runtime/3.5/windowsservercore-ltsc2025/Dockerfile)
69+
6370
### Windows Server Core 2022 amd64 Tags
6471

6572
Tag | Dockerfile

‎README.sdk.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ Version Tag | OS Version | Supported .NET Versions
6868

6969
## Full Tag Listing
7070

71+
### Windows Server Core 2025 amd64 Tags
72+
73+
Tag | Dockerfile
74+
---------| ---------------
75+
4.8.1-20241024-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile)
76+
3.5-20241024-windowsservercore-ltsc2025, 3.5-windowsservercore-ltsc2025, 3.5 | [Dockerfile](src/sdk/3.5/windowsservercore-ltsc2025/Dockerfile)
77+
7178
### Windows Server Core 2022 amd64 Tags
7279

7380
Tag | Dockerfile

‎README.wcf.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ Version Tag | OS Version | Supported .NET Versions
6868

6969
## Full Tag Listing
7070

71+
### Windows Server Core 2025 amd64 Tags
72+
73+
Tag | Dockerfile
74+
---------| ---------------
75+
4.8.1-20241024-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/wcf/4.8.1/windowsservercore-ltsc2025/Dockerfile)
76+
7177
### Windows Server Core 2022 amd64 Tags
7278

7379
Tag | Dockerfile

‎eng/dockerfile-templates/runtime/Dockerfile‎

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,45 @@
11
{{
2+
set isServer2025 to OS_VERSION_NUMBER = "ltsc2025" ^
3+
set isServer2022 to OS_VERSION_NUMBER = "ltsc2022" ^
4+
set isServer2019 to OS_VERSION_NUMBER = "ltsc2019" ^
5+
set isServer2016 to OS_VERSION_NUMBER = "ltsc2016" ^
6+
set isNet35 to PRODUCT_VERSION = "3.5" ^
7+
set isNet462 to PRODUCT_VERSION = "4.6.2" ^
8+
set isNet472 to PRODUCT_VERSION = "4.7.2" ^
9+
set isNet48 to PRODUCT_VERSION = "4.8" ^
10+
set isNet481 to PRODUCT_VERSION = "4.8.1" ^
11+
12+
set kbExists to VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)] != void ^
213
set is48SecurityRelease to (VARIABLES[cat("4.8-is-security-release|", OS_VERSION_NUMBER)] = "true") ^
3-
set apply35Patch to (VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)] != void && PRODUCT_VERSION = "3.5" && OS_VERSION_NUMBER != "ltsc2019") ^
4-
set applyPatch to VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", PRODUCT_VERSION)] != void &&
5-
!(
6-
(OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.7.2") ||
7-
(
14+
15+
set apply35Patch to kbExists && isNet35 && !isServer2019 ^
16+
set applyPatch to kbExists
17+
&& !(isServer2025 && isNet481)
18+
&& !(isServer2019 && isNet472)
19+
&& !(
20+
(isServer2019 && isNet472) ||
821
(
9-
(PRODUCT_VERSION = "4.8" && OS_VERSION_NUMBER != "ltsc2019") ||
10-
(PRODUCT_VERSION = "3.5" && OS_VERSION_NUMBER != "ltsc2019")
11-
) &&
12-
is48SecurityRelease
13-
)
14-
)
22+
(
23+
(isNet48 && !isServer2019) ||
24+
(isNet35 && !isServer2019)
25+
) &&
26+
is48SecurityRelease
27+
)
28+
) ^
29+
30+
set repo to "mcr.microsoft.com/windows/servercore" ^
31+
set tag to cat(OS_VERSION_NUMBER, "-amd64") ^
32+
33+
if isServer2025:{{
34+
set repo to cat(repo, "/insider") ^
35+
set tag to VARIABLES[cat("windowsservercore|", OS_VERSION_NUMBER, "|insider|tag")]
36+
}}^
37+
38+
set fromImage to cat(repo, ":", tag)
39+
1540
}}# escape=`
1641

17-
FROM mcr.microsoft.com/windows/servercore:{{OS_VERSION_NUMBER}}-amd64
42+
FROM {{fromImage}}
1843

1944
ENV {{
2045
if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8" || PRODUCT_VERSION = "4.8.1"
@@ -35,7 +60,7 @@ RUN `
3560
&& del microsoft-windows-netfx3-ondemand-package~31bf3856ad364e35~amd64~~.cab `
3661
&& powershell Remove-Item -Force -Recurse ${Env:TEMP}\* `
3762
`
38-
^elif (OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.8") || PRODUCT_VERSION = "4.8.1"
63+
^elif (OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "4.8") || (!isServer2025 && PRODUCT_VERSION = "4.8.1")
3964
: # Install .NET Fx {{PRODUCT_VERSION}}
4065
curl -fSLo dotnet-framework-installer.exe {{VARIABLES[cat(PRODUCT_VERSION, "|url")]}} `
4166
&& .\dotnet-framework-installer.exe /q `

‎eng/mcr-tags-metadata-templates/aspnet-tags.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
$(McrTagsYmlRepo:aspnet)
2+
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2025)
3+
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2025)
24
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
35
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
46
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2022)

‎eng/mcr-tags-metadata-templates/runtime-tags.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
$(McrTagsYmlRepo:runtime)
2+
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2025)
3+
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2025)
24
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
35
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
46
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2022)

‎eng/mcr-tags-metadata-templates/sdk-tags.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
$(McrTagsYmlRepo:sdk)
2+
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2025)
3+
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2025)
24
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
35
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
46
$(McrTagsYmlTagGroup:3.5-windowsservercore-ltsc2022)

‎eng/mcr-tags-metadata-templates/wcf-tags.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
$(McrTagsYmlRepo:wcf)
2+
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2025)
23
$(McrTagsYmlTagGroup:4.8.1-windowsservercore-ltsc2022)
34
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2022)
45
$(McrTagsYmlTagGroup:4.8-windowsservercore-ltsc2019)

‎manifest.datestamps.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
{
22
"variables": {
33
"CurrentReleaseDateStamp": "20241008",
4+
"ltsc2025-DateStamp": "20241024",
45

56
"RuntimeReleaseDateStamp": "$(CurrentReleaseDateStamp)",
67
"AspnetReleaseDateStamp": "$(CurrentReleaseDateStamp)",
78
"WcfReleaseDateStamp": "$(CurrentReleaseDateStamp)",
89
"SdkReleaseDateStamp": "$(CurrentReleaseDateStamp)",
10+
"ltsc2025-RuntimeReleaseDateStamp": "$(ltsc2025-DateStamp)",
11+
"ltsc2025-AspnetReleaseDateStamp": "$(ltsc2025-DateStamp)",
12+
"ltsc2025-WcfReleaseDateStamp": "$(ltsc2025-DateStamp)",
13+
"ltsc2025-SdkReleaseDateStamp": "$(ltsc2025-DateStamp)",
914

1015
"3.5-ltsc2016-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
1116
"3.5-ltsc2016-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
@@ -16,6 +21,9 @@
1621
"3.5-ltsc2022-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
1722
"3.5-ltsc2022-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
1823
"3.5-ltsc2022-Sdk-DateStamp": "$(SdkReleaseDateStamp)",
24+
"3.5-ltsc2025-Runtime-DateStamp": "$(ltsc2025-RuntimeReleaseDateStamp)",
25+
"3.5-ltsc2025-Aspnet-DateStamp": "$(ltsc2025-AspnetReleaseDateStamp)",
26+
"3.5-ltsc2025-Sdk-DateStamp": "$(ltsc2025-SdkReleaseDateStamp)",
1927
"4.6.2-ltsc2016-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
2028
"4.6.2-ltsc2016-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
2129
"4.6.2-ltsc2016-Wcf-DateStamp": "$(WcfReleaseDateStamp)",
@@ -46,6 +54,10 @@
4654
"4.8.1-ltsc2022-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",
4755
"4.8.1-ltsc2022-Aspnet-DateStamp": "$(AspnetReleaseDateStamp)",
4856
"4.8.1-ltsc2022-Wcf-DateStamp": "$(WcfReleaseDateStamp)",
49-
"4.8.1-ltsc2022-Sdk-DateStamp": "$(SdkReleaseDateStamp)"
57+
"4.8.1-ltsc2022-Sdk-DateStamp": "$(SdkReleaseDateStamp)",
58+
"4.8.1-ltsc2025-Runtime-DateStamp": "$(ltsc2025-RuntimeReleaseDateStamp)",
59+
"4.8.1-ltsc2025-Aspnet-DateStamp": "$(ltsc2025-AspnetReleaseDateStamp)",
60+
"4.8.1-ltsc2025-Wcf-DateStamp": "$(ltsc2025-WcfReleaseDateStamp)",
61+
"4.8.1-ltsc2025-Sdk-DateStamp": "$(ltsc2025-SdkReleaseDateStamp)"
5062
}
5163
}

0 commit comments

Comments
 (0)