2.8 isn't major, fix windows builder Golang version

caddyserver · May 1, 2024 · 98e68dd · 98e68dd
1 parent e05f668
commit 98e68dd
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/2.8/windows-builder/1809/Dockerfile b/2.8/windows-builder/1809/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21-windowsservercore-1809
+FROM golang:1.22-windowsservercore-1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/2.8/windows-builder/1809/Dockerfile.base b/2.8/windows-builder/1809/Dockerfile.base
@@ -1 +1 @@
-FROM golang:1.21-windowsservercore-1809
+FROM golang:1.22-windowsservercore-1809
diff --git a/2.8/windows-builder/ltsc2022/Dockerfile b/2.8/windows-builder/ltsc2022/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21-windowsservercore-ltsc2022
+FROM golang:1.22-windowsservercore-ltsc2022
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/2.8/windows-builder/ltsc2022/Dockerfile.base b/2.8/windows-builder/ltsc2022/Dockerfile.base
@@ -1 +1 @@
-FROM golang:1.21-windowsservercore-ltsc2022
+FROM golang:1.22-windowsservercore-ltsc2022
diff --git a/library/caddy b/library/caddy
@@ -1,49 +1,49 @@
 # this file is generated with gomplate:
-# template: https://github.com/caddyserver/caddy-docker/blob/a82cbc5b1bf43757f718d8b21adcca6a0df560c7/stackbrew.tmpl
+# template: https://github.com/caddyserver/caddy-docker/blob/e05f66898af9a0a694af637db2724f91d9d82ed7/stackbrew.tmpl
 # config context: https://github.com/caddyserver/caddy-docker/blob/dff8340ae685a6a952b7fb08590d18462748537c/stackbrew-config.yaml
 Maintainers: Dave Henderson (@hairyhenderson),
              Francis Lavoie (@francislavoie)
 
-Tags: 2.8.0-beta.1-alpine, 2.8-alpine, 2-alpine
-SharedTags: 2.8.0-beta.1, 2.8, 2
+Tags: 2.8.0-beta.1-alpine, 2.8-alpine
+SharedTags: 2.8.0-beta.1, 2.8
 GitRepo: https://github.com/caddyserver/caddy-docker.git
 Directory: 2.8/alpine
 GitCommit: dff8340ae685a6a952b7fb08590d18462748537c
 Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, s390x
 
-Tags: 2.8.0-beta.1-builder-alpine, 2.8-builder-alpine, 2-builder-alpine
-SharedTags: 2.8.0-beta.1-builder, 2.8-builder, 2-builder
+Tags: 2.8.0-beta.1-builder-alpine, 2.8-builder-alpine
+SharedTags: 2.8.0-beta.1-builder, 2.8-builder
 GitRepo: https://github.com/caddyserver/caddy-docker.git
 Directory: 2.8/builder
 GitCommit: dff8340ae685a6a952b7fb08590d18462748537c
 Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, s390x
 
-Tags: 2.8.0-beta.1-windowsservercore-1809, 2.8-windowsservercore-1809, 2-windowsservercore-1809
-SharedTags: 2.8.0-beta.1-windowsservercore, 2.8-windowsservercore, 2-windowsservercore, 2.8.0-beta.1, 2.8, 2
+Tags: 2.8.0-beta.1-windowsservercore-1809, 2.8-windowsservercore-1809
+SharedTags: 2.8.0-beta.1-windowsservercore, 2.8-windowsservercore, 2.8.0-beta.1, 2.8
 GitRepo: https://github.com/caddyserver/caddy-docker.git
 Directory: 2.8/windows/1809
 GitCommit: dff8340ae685a6a952b7fb08590d18462748537c
 Architectures: windows-amd64
 Constraints: windowsservercore-1809
 
-Tags: 2.8.0-beta.1-windowsservercore-ltsc2022, 2.8-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022
-SharedTags: 2.8.0-beta.1-windowsservercore, 2.8-windowsservercore, 2-windowsservercore, 2.8.0-beta.1, 2.8, 2
+Tags: 2.8.0-beta.1-windowsservercore-ltsc2022, 2.8-windowsservercore-ltsc2022
+SharedTags: 2.8.0-beta.1-windowsservercore, 2.8-windowsservercore, 2.8.0-beta.1, 2.8
 GitRepo: https://github.com/caddyserver/caddy-docker.git
 Directory: 2.8/windows/ltsc2022
 GitCommit: dff8340ae685a6a952b7fb08590d18462748537c
 Architectures: windows-amd64
 Constraints: windowsservercore-ltsc2022
 
-Tags: 2.8.0-beta.1-builder-windowsservercore-1809, 2.8-builder-windowsservercore-1809, 2-builder-windowsservercore-1809
-SharedTags: 2.8.0-beta.1-builder, 2.8-builder, 2-builder
+Tags: 2.8.0-beta.1-builder-windowsservercore-1809, 2.8-builder-windowsservercore-1809
+SharedTags: 2.8.0-beta.1-builder, 2.8-builder
 GitRepo: https://github.com/caddyserver/caddy-docker.git
 Directory: 2.8/windows-builder/1809
 GitCommit: dff8340ae685a6a952b7fb08590d18462748537c
 Architectures: windows-amd64
 Constraints: windowsservercore-1809
 
-Tags: 2.8.0-beta.1-builder-windowsservercore-ltsc2022, 2.8-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022
-SharedTags: 2.8.0-beta.1-builder, 2.8-builder, 2-builder
+Tags: 2.8.0-beta.1-builder-windowsservercore-ltsc2022, 2.8-builder-windowsservercore-ltsc2022
+SharedTags: 2.8.0-beta.1-builder, 2.8-builder
 GitRepo: https://github.com/caddyserver/caddy-docker.git
 Directory: 2.8/windows-builder/ltsc2022
 GitCommit: dff8340ae685a6a952b7fb08590d18462748537c

diff --git a/stackbrew-config.yaml b/stackbrew-config.yaml
@@ -1,6 +1,6 @@
 versions:
   - caddy_version: '2.8.0-beta.1'
-    is_major: true
+    is_major: false
     is_latest: false
     dist_commit: d129ae6aec6af2182217ee8a235f4df8cd2bbfde
   - caddy_version: '2.7.6'