Skip to content

Conversation

@francislavoie
Copy link
Contributor

caddyserver/caddy-docker#403

As per recommendations in #18910 and #19138

/cc @tianon

@francislavoie francislavoie requested a review from a team as a code owner June 6, 2025 15:48
@github-actions
Copy link

github-actions bot commented Jun 6, 2025

Diff for ded4242:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b75476e..ad01891 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -14,14 +14,6 @@ GitRepo: https://github.com/caddyserver/caddy-docker.git
 GitCommit: aa3e73e0731fbca665be75edef9fbb60d3169278
 Directory: 2.10/builder
 
-Tags: 2.10.0-builder-windowsservercore-1809, 2.10-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
-SharedTags: 2.10.0-builder, 2.10-builder, 2-builder, builder
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: aa3e73e0731fbca665be75edef9fbb60d3169278
-Directory: 2.10/windows-builder/1809
-Constraints: windowsservercore-1809
-
 Tags: 2.10.0-builder-windowsservercore-ltsc2022, 2.10-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
 SharedTags: 2.10.0-builder, 2.10-builder, 2-builder, builder
 Architectures: windows-amd64
@@ -30,13 +22,13 @@ GitCommit: aa3e73e0731fbca665be75edef9fbb60d3169278
 Directory: 2.10/windows-builder/ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 2.10.0-windowsservercore-1809, 2.10-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
-SharedTags: 2.10.0-windowsservercore, 2.10-windowsservercore, 2-windowsservercore, windowsservercore, 2.10.0, 2.10, 2, latest
+Tags: 2.10.0-builder-windowsservercore-ltsc2025, 2.10-builder-windowsservercore-ltsc2025, 2-builder-windowsservercore-ltsc2025, builder-windowsservercore-ltsc2025
+SharedTags: 2.10.0-builder, 2.10-builder, 2-builder, builder
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: aa3e73e0731fbca665be75edef9fbb60d3169278
-Directory: 2.10/windows/1809
-Constraints: windowsservercore-1809
+GitCommit: b4226f27405e98d9330ca807a80807d5d523ebba
+Directory: 2.10/windows-builder/ltsc2025
+Constraints: windowsservercore-ltsc2025
 
 Tags: 2.10.0-windowsservercore-ltsc2022, 2.10-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
 SharedTags: 2.10.0-windowsservercore, 2.10-windowsservercore, 2-windowsservercore, windowsservercore, 2.10.0, 2.10, 2, latest
@@ -45,3 +37,11 @@ GitRepo: https://github.com/caddyserver/caddy-docker.git
 GitCommit: aa3e73e0731fbca665be75edef9fbb60d3169278
 Directory: 2.10/windows/ltsc2022
 Constraints: windowsservercore-ltsc2022
+
+Tags: 2.10.0-windowsservercore-ltsc2025, 2.10-windowsservercore-ltsc2025, 2-windowsservercore-ltsc2025, windowsservercore-ltsc2025
+SharedTags: 2.10.0-windowsservercore, 2.10-windowsservercore, 2-windowsservercore, windowsservercore, 2.10.0, 2.10, 2, latest
+Architectures: windows-amd64
+GitRepo: https://github.com/caddyserver/caddy-docker.git
+GitCommit: b4226f27405e98d9330ca807a80807d5d523ebba
+Directory: 2.10/windows/ltsc2025
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 427518a..8dcd381 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,35 +2,35 @@ caddy:2
 caddy:2-alpine
 caddy:2-builder
 caddy:2-builder-alpine
-caddy:2-builder-windowsservercore-1809
 caddy:2-builder-windowsservercore-ltsc2022
+caddy:2-builder-windowsservercore-ltsc2025
 caddy:2-windowsservercore
-caddy:2-windowsservercore-1809
 caddy:2-windowsservercore-ltsc2022
+caddy:2-windowsservercore-ltsc2025
 caddy:2.10
 caddy:2.10-alpine
 caddy:2.10-builder
 caddy:2.10-builder-alpine
-caddy:2.10-builder-windowsservercore-1809
 caddy:2.10-builder-windowsservercore-ltsc2022
+caddy:2.10-builder-windowsservercore-ltsc2025
 caddy:2.10-windowsservercore
-caddy:2.10-windowsservercore-1809
 caddy:2.10-windowsservercore-ltsc2022
+caddy:2.10-windowsservercore-ltsc2025
 caddy:2.10.0
 caddy:2.10.0-alpine
 caddy:2.10.0-builder
 caddy:2.10.0-builder-alpine
-caddy:2.10.0-builder-windowsservercore-1809
 caddy:2.10.0-builder-windowsservercore-ltsc2022
+caddy:2.10.0-builder-windowsservercore-ltsc2025
 caddy:2.10.0-windowsservercore
-caddy:2.10.0-windowsservercore-1809
 caddy:2.10.0-windowsservercore-ltsc2022
+caddy:2.10.0-windowsservercore-ltsc2025
 caddy:alpine
 caddy:builder
 caddy:builder-alpine
-caddy:builder-windowsservercore-1809
 caddy:builder-windowsservercore-ltsc2022
+caddy:builder-windowsservercore-ltsc2025
 caddy:latest
 caddy:windowsservercore
-caddy:windowsservercore-1809
 caddy:windowsservercore-ltsc2022
+caddy:windowsservercore-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 6cecc85..ff62dfb 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,6 @@
 caddy:alpine
 caddy:builder-alpine
-caddy:builder-windowsservercore-1809
 caddy:builder-windowsservercore-ltsc2022
-caddy:windowsservercore-1809
+caddy:builder-windowsservercore-ltsc2025
 caddy:windowsservercore-ltsc2022
+caddy:windowsservercore-ltsc2025
diff --git a/caddy_builder-windowsservercore-1809/Dockerfile b/caddy_builder-windowsservercore-ltsc2025/Dockerfile
similarity index 95%
rename from caddy_builder-windowsservercore-1809/Dockerfile
rename to caddy_builder-windowsservercore-ltsc2025/Dockerfile
index 705f714..44af4a1 100644
--- a/caddy_builder-windowsservercore-1809/Dockerfile
+++ b/caddy_builder-windowsservercore-ltsc2025/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-windowsservercore-1809
+FROM golang:1.23-windowsservercore-ltsc2025
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
diff --git a/caddy_windowsservercore-1809/Dockerfile b/caddy_windowsservercore-ltsc2025/Dockerfile
similarity index 97%
rename from caddy_windowsservercore-1809/Dockerfile
rename to caddy_windowsservercore-ltsc2025/Dockerfile
index 2f75b17..b89092e 100644
--- a/caddy_windowsservercore-1809/Dockerfile
+++ b/caddy_windowsservercore-ltsc2025/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/servercore:1809
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Relevant Maintainers:

@tianon tianon merged commit 534d176 into docker-library:master Jun 6, 2025
11 checks passed
@francislavoie francislavoie deleted the patch-1 branch June 6, 2025 17:22
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.

2 participants