Skip to content

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 21, 2025

Changes:

Changes:

- docker-library/golang@985b3b1: Merge pull request docker-library/golang#546 from gdams/win25
- docker-library/golang@2bbd50d: add windows server 2025 support
@tianon tianon requested a review from a team as a code owner January 21, 2025 18:05
Copy link

Diff for 79b08c7:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9cceab7..1dbd614 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -39,6 +39,14 @@ Directory: 1.22/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 1.22.11-nanoserver-ltsc2025, 1.22-nanoserver-ltsc2025
+SharedTags: 1.22.11-nanoserver, 1.22-nanoserver
+Architectures: windows-amd64
+GitCommit: 2bbd50d64246d302d782d13599d9a8b3bf616116
+Directory: 1.22/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 1.22.11-windowsservercore-1809, 1.22-windowsservercore-1809
 SharedTags: 1.22.11-windowsservercore, 1.22-windowsservercore, 1.22.11, 1.22
 Architectures: windows-amd64
@@ -55,6 +63,14 @@ Directory: 1.22/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
+Tags: 1.22.11-windowsservercore-ltsc2025, 1.22-windowsservercore-ltsc2025
+SharedTags: 1.22.11-windowsservercore, 1.22-windowsservercore, 1.22.11, 1.22
+Architectures: windows-amd64
+GitCommit: 2bbd50d64246d302d782d13599d9a8b3bf616116
+Directory: 1.22/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
 Tags: 1.23.5-alpine3.20, 1.23-alpine3.20, 1-alpine3.20, alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 6f9f0098aee5d294d1f41c399ac0ecedca8e6d2d
@@ -92,6 +108,14 @@ Directory: 1.23/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 1.23.5-nanoserver-ltsc2025, 1.23-nanoserver-ltsc2025, 1-nanoserver-ltsc2025, nanoserver-ltsc2025
+SharedTags: 1.23.5-nanoserver, 1.23-nanoserver, 1-nanoserver, nanoserver
+Architectures: windows-amd64
+GitCommit: 2bbd50d64246d302d782d13599d9a8b3bf616116
+Directory: 1.23/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 1.23.5-windowsservercore-1809, 1.23-windowsservercore-1809, 1-windowsservercore-1809, windowsservercore-1809
 SharedTags: 1.23.5-windowsservercore, 1.23-windowsservercore, 1-windowsservercore, windowsservercore, 1.23.5, 1.23, 1, latest
 Architectures: windows-amd64
@@ -108,6 +132,14 @@ Directory: 1.23/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
+Tags: 1.23.5-windowsservercore-ltsc2025, 1.23-windowsservercore-ltsc2025, 1-windowsservercore-ltsc2025, windowsservercore-ltsc2025
+SharedTags: 1.23.5-windowsservercore, 1.23-windowsservercore, 1-windowsservercore, windowsservercore, 1.23.5, 1.23, 1, latest
+Architectures: windows-amd64
+GitCommit: 2bbd50d64246d302d782d13599d9a8b3bf616116
+Directory: 1.23/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
+
 Tags: 1.24rc2-alpine3.20, 1.24-rc-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
 GitCommit: 6923cf49962c9bee69b0e3b363bcc314db012e90
@@ -145,6 +177,14 @@ Directory: 1.24-rc/windows/nanoserver-ltsc2022
 Builder: classic
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
 
+Tags: 1.24rc2-nanoserver-ltsc2025, 1.24-rc-nanoserver-ltsc2025
+SharedTags: 1.24rc2-nanoserver, 1.24-rc-nanoserver
+Architectures: windows-amd64
+GitCommit: 2bbd50d64246d302d782d13599d9a8b3bf616116
+Directory: 1.24-rc/windows/nanoserver-ltsc2025
+Builder: classic
+Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
+
 Tags: 1.24rc2-windowsservercore-1809, 1.24-rc-windowsservercore-1809
 SharedTags: 1.24rc2-windowsservercore, 1.24-rc-windowsservercore, 1.24rc2, 1.24-rc
 Architectures: windows-amd64
@@ -160,3 +200,11 @@ GitCommit: 6923cf49962c9bee69b0e3b363bcc314db012e90
 Directory: 1.24-rc/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
+
+Tags: 1.24rc2-windowsservercore-ltsc2025, 1.24-rc-windowsservercore-ltsc2025
+SharedTags: 1.24rc2-windowsservercore, 1.24-rc-windowsservercore, 1.24rc2, 1.24-rc
+Architectures: windows-amd64
+GitCommit: 2bbd50d64246d302d782d13599d9a8b3bf616116
+Directory: 1.24-rc/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index c6e444c..24b6e42 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -7,9 +7,11 @@ golang:1-bullseye
 golang:1-nanoserver
 golang:1-nanoserver-1809
 golang:1-nanoserver-ltsc2022
+golang:1-nanoserver-ltsc2025
 golang:1-windowsservercore
 golang:1-windowsservercore-1809
 golang:1-windowsservercore-ltsc2022
+golang:1-windowsservercore-ltsc2025
 golang:1.22
 golang:1.22-alpine
 golang:1.22-alpine3.20
@@ -19,9 +21,11 @@ golang:1.22-bullseye
 golang:1.22-nanoserver
 golang:1.22-nanoserver-1809
 golang:1.22-nanoserver-ltsc2022
+golang:1.22-nanoserver-ltsc2025
 golang:1.22-windowsservercore
 golang:1.22-windowsservercore-1809
 golang:1.22-windowsservercore-ltsc2022
+golang:1.22-windowsservercore-ltsc2025
 golang:1.22.11
 golang:1.22.11-alpine
 golang:1.22.11-alpine3.20
@@ -31,9 +35,11 @@ golang:1.22.11-bullseye
 golang:1.22.11-nanoserver
 golang:1.22.11-nanoserver-1809
 golang:1.22.11-nanoserver-ltsc2022
+golang:1.22.11-nanoserver-ltsc2025
 golang:1.22.11-windowsservercore
 golang:1.22.11-windowsservercore-1809
 golang:1.22.11-windowsservercore-ltsc2022
+golang:1.22.11-windowsservercore-ltsc2025
 golang:1.23
 golang:1.23-alpine
 golang:1.23-alpine3.20
@@ -43,9 +49,11 @@ golang:1.23-bullseye
 golang:1.23-nanoserver
 golang:1.23-nanoserver-1809
 golang:1.23-nanoserver-ltsc2022
+golang:1.23-nanoserver-ltsc2025
 golang:1.23-windowsservercore
 golang:1.23-windowsservercore-1809
 golang:1.23-windowsservercore-ltsc2022
+golang:1.23-windowsservercore-ltsc2025
 golang:1.23.5
 golang:1.23.5-alpine
 golang:1.23.5-alpine3.20
@@ -55,9 +63,11 @@ golang:1.23.5-bullseye
 golang:1.23.5-nanoserver
 golang:1.23.5-nanoserver-1809
 golang:1.23.5-nanoserver-ltsc2022
+golang:1.23.5-nanoserver-ltsc2025
 golang:1.23.5-windowsservercore
 golang:1.23.5-windowsservercore-1809
 golang:1.23.5-windowsservercore-ltsc2022
+golang:1.23.5-windowsservercore-ltsc2025
 golang:1.24rc2
 golang:1.24rc2-alpine
 golang:1.24rc2-alpine3.20
@@ -67,9 +77,11 @@ golang:1.24rc2-bullseye
 golang:1.24rc2-nanoserver
 golang:1.24rc2-nanoserver-1809
 golang:1.24rc2-nanoserver-ltsc2022
+golang:1.24rc2-nanoserver-ltsc2025
 golang:1.24rc2-windowsservercore
 golang:1.24rc2-windowsservercore-1809
 golang:1.24rc2-windowsservercore-ltsc2022
+golang:1.24rc2-windowsservercore-ltsc2025
 golang:1.24-rc
 golang:1.24-rc-alpine
 golang:1.24-rc-alpine3.20
@@ -79,9 +91,11 @@ golang:1.24-rc-bullseye
 golang:1.24-rc-nanoserver
 golang:1.24-rc-nanoserver-1809
 golang:1.24-rc-nanoserver-ltsc2022
+golang:1.24-rc-nanoserver-ltsc2025
 golang:1.24-rc-windowsservercore
 golang:1.24-rc-windowsservercore-1809
 golang:1.24-rc-windowsservercore-ltsc2022
+golang:1.24-rc-windowsservercore-ltsc2025
 golang:alpine
 golang:alpine3.20
 golang:alpine3.21
@@ -91,6 +105,8 @@ golang:latest
 golang:nanoserver
 golang:nanoserver-1809
 golang:nanoserver-ltsc2022
+golang:nanoserver-ltsc2025
 golang:windowsservercore
 golang:windowsservercore-1809
 golang:windowsservercore-ltsc2022
+golang:windowsservercore-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index de91792..7f85522 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,21 +4,27 @@ golang:1.22-bookworm
 golang:1.22-bullseye
 golang:1.22-windowsservercore-1809
 golang:1.22-windowsservercore-ltsc2022
+golang:1.22-windowsservercore-ltsc2025
 golang:1.24-rc-alpine
 golang:1.24-rc-alpine3.20
 golang:1.24-rc-bookworm
 golang:1.24-rc-bullseye
 golang:1.24-rc-windowsservercore-1809
 golang:1.24-rc-windowsservercore-ltsc2022
+golang:1.24-rc-windowsservercore-ltsc2025
 golang:alpine
 golang:alpine3.20
 golang:bookworm
 golang:bullseye
 golang:windowsservercore-1809
 golang:windowsservercore-ltsc2022
+golang:windowsservercore-ltsc2025
 golang:1.22-nanoserver-1809
 golang:1.22-nanoserver-ltsc2022
+golang:1.22-nanoserver-ltsc2025
 golang:1.24-rc-nanoserver-1809
 golang:1.24-rc-nanoserver-ltsc2022
+golang:1.24-rc-nanoserver-ltsc2025
 golang:nanoserver-1809
 golang:nanoserver-ltsc2022
+golang:nanoserver-ltsc2025
diff --git a/golang_1.22-nanoserver-ltsc2022/Dockerfile b/golang_1.22-nanoserver-ltsc2025/Dockerfile
similarity index 90%
copy from golang_1.22-nanoserver-ltsc2022/Dockerfile
copy to golang_1.22-nanoserver-ltsc2025/Dockerfile
index 1869dcf..b2268a7 100644
--- a/golang_1.22-nanoserver-ltsc2022/Dockerfile
+++ b/golang_1.22-nanoserver-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/S", "/C"]
 
@@ -24,7 +24,7 @@ USER ContainerUser
 ENV GOLANG_VERSION 1.22.11
 
 # Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.22.11-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.22.11-windowsservercore-ltsc2025 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
 RUN go version
 
 WORKDIR $GOPATH
diff --git a/golang_1.22-windowsservercore-1809/Dockerfile b/golang_1.22-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from golang_1.22-windowsservercore-1809/Dockerfile
copy to golang_1.22-windowsservercore-ltsc2025/Dockerfile
index dffbbba..7f1d48a 100644
--- a/golang_1.22-windowsservercore-1809/Dockerfile
+++ b/golang_1.22-windowsservercore-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/golang_1.24-rc-nanoserver-ltsc2022/Dockerfile b/golang_1.24-rc-nanoserver-ltsc2025/Dockerfile
similarity index 90%
copy from golang_1.24-rc-nanoserver-ltsc2022/Dockerfile
copy to golang_1.24-rc-nanoserver-ltsc2025/Dockerfile
index 89336a2..3ec137e 100644
--- a/golang_1.24-rc-nanoserver-ltsc2022/Dockerfile
+++ b/golang_1.24-rc-nanoserver-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/S", "/C"]
 
@@ -24,7 +24,7 @@ USER ContainerUser
 ENV GOLANG_VERSION 1.24rc2
 
 # Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.24rc2-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.24rc2-windowsservercore-ltsc2025 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
 RUN go version
 
 WORKDIR $GOPATH
diff --git a/golang_1.24-rc-windowsservercore-1809/Dockerfile b/golang_1.24-rc-windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from golang_1.24-rc-windowsservercore-1809/Dockerfile
copy to golang_1.24-rc-windowsservercore-ltsc2025/Dockerfile
index 3e4eb43..253905b 100644
--- a/golang_1.24-rc-windowsservercore-1809/Dockerfile
+++ b/golang_1.24-rc-windowsservercore-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
diff --git a/golang_nanoserver-ltsc2022/Dockerfile b/golang_nanoserver-ltsc2025/Dockerfile
similarity index 90%
copy from golang_nanoserver-ltsc2022/Dockerfile
copy to golang_nanoserver-ltsc2025/Dockerfile
index e4e656d..1f3fa8e 100644
--- a/golang_nanoserver-ltsc2022/Dockerfile
+++ b/golang_nanoserver-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
 
 SHELL ["cmd", "/S", "/C"]
 
@@ -24,7 +24,7 @@ USER ContainerUser
 ENV GOLANG_VERSION 1.23.5
 
 # Docker's Windows path parsing is absolutely *cursed*; please just trust me on this one -Tianon
-COPY --from=golang:1.23.5-windowsservercore-ltsc2022 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
+COPY --from=golang:1.23.5-windowsservercore-ltsc2025 ["C:\\\\Program Files\\\\Go","C:\\\\Program Files\\\\Go"]
 RUN go version
 
 WORKDIR $GOPATH
diff --git a/golang_windowsservercore-1809/Dockerfile b/golang_windowsservercore-ltsc2025/Dockerfile
similarity index 98%
copy from golang_windowsservercore-1809/Dockerfile
copy to golang_windowsservercore-ltsc2025/Dockerfile
index 598149c..aaab3ad 100644
--- a/golang_windowsservercore-1809/Dockerfile
+++ b/golang_windowsservercore-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Relevant Maintainers:

@yosifkit yosifkit merged commit 55d960d into docker-library:master Jan 21, 2025
26 checks passed
@yosifkit yosifkit deleted the golang branch January 21, 2025 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants