Add Dockerfiles for Windows Server 2025 #1183
Conversation
lbussell
force-pushed
the
server-2025
branch
from
28fe112 to
79e45f3
Compare
lbussell
force-pushed
the
server-2025
branch
from
79e45f3 to
dc9da19
Compare
| @@ -57,7 +96,7 @@ RUN ` | |||
| && mkdir patch ` | |||
| && expand patch.msu patch -F:* ` | |||
| && del /F /Q patch.msu ` | |||
| && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\windows10.0-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if PRODUCT_VERSION = "4.8.1":1}}.cab ` | |||
| && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\{{winver}}-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if isServer2025 || isNet481:1}}.cab ` | |||
There was a problem hiding this comment.
I think isServer2025 is redundant in that condition.
| && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\{{winver}}-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if isServer2025 || isNet481:1}}.cab ` | |
| && dism /Online /Quiet /Add-Package /PackagePath:C:\patch\{{winver}}-{{VARIABLES[cat("kb|", OS_VERSION_NUMBER, "|", when(PRODUCT_VERSION = "3.5", "default", PRODUCT_VERSION))]}}-x64{{if OS_VERSION_NUMBER != "ltsc2019" || PRODUCT_VERSION = "4.8":-ndp48}}{{if isNet481:1}}.cab ` |
There was a problem hiding this comment.
It is necessary. For server 2025, there is no distinction between .NET 3.5 latest patch .NET 4.8.1 latest patch. To keep the implementation simpler, I directed both of those cases to this applyPatch branch. Either we need to keep this condition so that the filename is correct in the Server 2025 3.5 Dockerfile, or we can add the 1 suffix to the "apply latest 3.5 patch" instructions instead. Then the only difference would be the comment.
|
lbussell@36261be is an alternative to 6691140. I could go either way. |
I don't mind the new style. But I do think that it should be applied consistently across all the templates in a separate PR. |
Related: #1146