Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

caddy: v2.9.1 release #18209

Merged
merged 1 commit into from
Jan 8, 2025
Merged

caddy: v2.9.1 release #18209

merged 1 commit into from
Jan 8, 2025

Conversation

francislavoie
Copy link
Contributor

@francislavoie francislavoie commented Jan 8, 2025

We skipped the docker release for 2.9.0 because we noticed some breaking changes soon after release.

https://github.com/caddyserver/caddy/releases/tag/v2.9.1

caddyserver/caddy-docker#386

@francislavoie francislavoie requested a review from a team as a code owner January 8, 2025 17:34
Copy link

github-actions bot commented Jan 8, 2025

Diff for 036ac36:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8120c1d..5cdc63b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,93 +1,47 @@
 Maintainers: Dave Henderson (@hairyhenderson), Francis Lavoie (@francislavoie)
 
-Tags: 2.8.4-alpine, 2.8-alpine, 2-alpine, alpine
-SharedTags: 2.8.4, 2.8, 2, latest
+Tags: 2.9.1-alpine, 2.9-alpine, 2-alpine, alpine
+SharedTags: 2.9.1, 2.9, 2, latest
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, riscv64, s390x
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 645721b4b87b6c3a692641213853ce064eb82fe2
-Directory: 2.8/alpine
-
-Tags: 2.8.4-builder-alpine, 2.8-builder-alpine, 2-builder-alpine, builder-alpine
-SharedTags: 2.8.4-builder, 2.8-builder, 2-builder, builder
-Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 507b6b921c822ccc33e56e40a12d0fcb5be0f61c
-Directory: 2.8/builder
-
-Tags: 2.8.4-builder-windowsservercore-1809, 2.8-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
-SharedTags: 2.8.4-builder, 2.8-builder, 2-builder, builder
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 507b6b921c822ccc33e56e40a12d0fcb5be0f61c
-Directory: 2.8/windows-builder/1809
-Constraints: windowsservercore-1809
-
-Tags: 2.8.4-builder-windowsservercore-ltsc2022, 2.8-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
-SharedTags: 2.8.4-builder, 2.8-builder, 2-builder, builder
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 507b6b921c822ccc33e56e40a12d0fcb5be0f61c
-Directory: 2.8/windows-builder/ltsc2022
-Constraints: windowsservercore-ltsc2022
-
-Tags: 2.8.4-windowsservercore-1809, 2.8-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
-SharedTags: 2.8.4-windowsservercore, 2.8-windowsservercore, 2-windowsservercore, windowsservercore, 2.8.4, 2.8, 2, latest
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: fb6e8723745c60fe413a311b484704e8ce3fcfd3
-Directory: 2.8/windows/1809
-Constraints: windowsservercore-1809
-
-Tags: 2.8.4-windowsservercore-ltsc2022, 2.8-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 2.8.4-windowsservercore, 2.8-windowsservercore, 2-windowsservercore, windowsservercore, 2.8.4, 2.8, 2, latest
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: fb6e8723745c60fe413a311b484704e8ce3fcfd3
-Directory: 2.8/windows/ltsc2022
-Constraints: windowsservercore-ltsc2022
-
-Tags: 2.9.0-beta.3-alpine, 2.9-alpine
-SharedTags: 2.9.0-beta.3, 2.9
-Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, riscv64, s390x
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 507b6b921c822ccc33e56e40a12d0fcb5be0f61c
+GitCommit: bcbe8e419506954462fe5e771ed8878ba335a9d5
 Directory: 2.9/alpine
 
-Tags: 2.9.0-beta.3-builder-alpine, 2.9-builder-alpine
-SharedTags: 2.9.0-beta.3-builder, 2.9-builder
+Tags: 2.9.1-builder-alpine, 2.9-builder-alpine, 2-builder-alpine, builder-alpine
+SharedTags: 2.9.1-builder, 2.9-builder, 2-builder, builder
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, riscv64, s390x
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 507b6b921c822ccc33e56e40a12d0fcb5be0f61c
+GitCommit: bcbe8e419506954462fe5e771ed8878ba335a9d5
 Directory: 2.9/builder
 
-Tags: 2.9.0-beta.3-builder-windowsservercore-1809, 2.9-builder-windowsservercore-1809
-SharedTags: 2.9.0-beta.3-builder, 2.9-builder
+Tags: 2.9.1-builder-windowsservercore-1809, 2.9-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
+SharedTags: 2.9.1-builder, 2.9-builder, 2-builder, builder
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 507b6b921c822ccc33e56e40a12d0fcb5be0f61c
+GitCommit: bcbe8e419506954462fe5e771ed8878ba335a9d5
 Directory: 2.9/windows-builder/1809
 Constraints: windowsservercore-1809
 
-Tags: 2.9.0-beta.3-builder-windowsservercore-ltsc2022, 2.9-builder-windowsservercore-ltsc2022
-SharedTags: 2.9.0-beta.3-builder, 2.9-builder
+Tags: 2.9.1-builder-windowsservercore-ltsc2022, 2.9-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
+SharedTags: 2.9.1-builder, 2.9-builder, 2-builder, builder
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 507b6b921c822ccc33e56e40a12d0fcb5be0f61c
+GitCommit: bcbe8e419506954462fe5e771ed8878ba335a9d5
 Directory: 2.9/windows-builder/ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 2.9.0-beta.3-windowsservercore-1809, 2.9-windowsservercore-1809
-SharedTags: 2.9.0-beta.3-windowsservercore, 2.9-windowsservercore, 2.9.0-beta.3, 2.9
+Tags: 2.9.1-windowsservercore-1809, 2.9-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
+SharedTags: 2.9.1-windowsservercore, 2.9-windowsservercore, 2-windowsservercore, windowsservercore, 2.9.1, 2.9, 2, latest
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 507b6b921c822ccc33e56e40a12d0fcb5be0f61c
+GitCommit: bcbe8e419506954462fe5e771ed8878ba335a9d5
 Directory: 2.9/windows/1809
 Constraints: windowsservercore-1809
 
-Tags: 2.9.0-beta.3-windowsservercore-ltsc2022, 2.9-windowsservercore-ltsc2022
-SharedTags: 2.9.0-beta.3-windowsservercore, 2.9-windowsservercore, 2.9.0-beta.3, 2.9
+Tags: 2.9.1-windowsservercore-ltsc2022, 2.9-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 2.9.1-windowsservercore, 2.9-windowsservercore, 2-windowsservercore, windowsservercore, 2.9.1, 2.9, 2, latest
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 507b6b921c822ccc33e56e40a12d0fcb5be0f61c
+GitCommit: bcbe8e419506954462fe5e771ed8878ba335a9d5
 Directory: 2.9/windows/ltsc2022
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index d25bca8..d4acf54 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -7,24 +7,6 @@ caddy:2-builder-windowsservercore-ltsc2022
 caddy:2-windowsservercore
 caddy:2-windowsservercore-1809
 caddy:2-windowsservercore-ltsc2022
-caddy:2.8
-caddy:2.8-alpine
-caddy:2.8-builder
-caddy:2.8-builder-alpine
-caddy:2.8-builder-windowsservercore-1809
-caddy:2.8-builder-windowsservercore-ltsc2022
-caddy:2.8-windowsservercore
-caddy:2.8-windowsservercore-1809
-caddy:2.8-windowsservercore-ltsc2022
-caddy:2.8.4
-caddy:2.8.4-alpine
-caddy:2.8.4-builder
-caddy:2.8.4-builder-alpine
-caddy:2.8.4-builder-windowsservercore-1809
-caddy:2.8.4-builder-windowsservercore-ltsc2022
-caddy:2.8.4-windowsservercore
-caddy:2.8.4-windowsservercore-1809
-caddy:2.8.4-windowsservercore-ltsc2022
 caddy:2.9
 caddy:2.9-alpine
 caddy:2.9-builder
@@ -34,15 +16,15 @@ caddy:2.9-builder-windowsservercore-ltsc2022
 caddy:2.9-windowsservercore
 caddy:2.9-windowsservercore-1809
 caddy:2.9-windowsservercore-ltsc2022
-caddy:2.9.0-beta.3
-caddy:2.9.0-beta.3-alpine
-caddy:2.9.0-beta.3-builder
-caddy:2.9.0-beta.3-builder-alpine
-caddy:2.9.0-beta.3-builder-windowsservercore-1809
-caddy:2.9.0-beta.3-builder-windowsservercore-ltsc2022
-caddy:2.9.0-beta.3-windowsservercore
-caddy:2.9.0-beta.3-windowsservercore-1809
-caddy:2.9.0-beta.3-windowsservercore-ltsc2022
+caddy:2.9.1
+caddy:2.9.1-alpine
+caddy:2.9.1-builder
+caddy:2.9.1-builder-alpine
+caddy:2.9.1-builder-windowsservercore-1809
+caddy:2.9.1-builder-windowsservercore-ltsc2022
+caddy:2.9.1-windowsservercore
+caddy:2.9.1-windowsservercore-1809
+caddy:2.9.1-windowsservercore-ltsc2022
 caddy:alpine
 caddy:builder
 caddy:builder-alpine
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c4f49a1..6cecc85 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,3 @@
-caddy:2.9-alpine
-caddy:2.9-builder-alpine
-caddy:2.9-builder-windowsservercore-1809
-caddy:2.9-builder-windowsservercore-ltsc2022
-caddy:2.9-windowsservercore-1809
-caddy:2.9-windowsservercore-ltsc2022
 caddy:alpine
 caddy:builder-alpine
 caddy:builder-windowsservercore-1809
diff --git a/caddy_2.9-alpine/Dockerfile b/caddy_2.9-alpine/Dockerfile
deleted file mode 100644
index 3be62d6..0000000
diff --git a/caddy_2.9-builder-alpine/Dockerfile b/caddy_2.9-builder-alpine/Dockerfile
deleted file mode 100644
index ad6f4ec..0000000
diff --git a/caddy_2.9-builder-alpine/caddy-builder.sh b/caddy_2.9-builder-alpine/caddy-builder.sh
deleted file mode 100755
index cd4b699..0000000
diff --git a/caddy_2.9-builder-windowsservercore-1809/Dockerfile b/caddy_2.9-builder-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 18d961a..0000000
diff --git a/caddy_2.9-builder-windowsservercore-ltsc2022/Dockerfile b/caddy_2.9-builder-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index d6512b0..0000000
diff --git a/caddy_2.9-windowsservercore-1809/Dockerfile b/caddy_2.9-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 8cdf16c..0000000
diff --git a/caddy_2.9-windowsservercore-ltsc2022/Dockerfile b/caddy_2.9-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index ad12ed8..0000000
diff --git a/caddy_alpine/Dockerfile b/caddy_alpine/Dockerfile
index f800be9..31c9ec2 100644
--- a/caddy_alpine/Dockerfile
+++ b/caddy_alpine/Dockerfile
@@ -12,25 +12,25 @@ RUN set -eux; \
 		/etc/caddy \
 		/usr/share/caddy \
 	; \
-	wget -O /etc/caddy/Caddyfile "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/config/Caddyfile"; \
-	wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/welcome/index.html"
+	wget -O /etc/caddy/Caddyfile "https://github.com/caddyserver/dist/raw/33ae08ff08d168572df2956ed14fbc4949880d94/config/Caddyfile"; \
+	wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/33ae08ff08d168572df2956ed14fbc4949880d94/welcome/index.html"
 
 # https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.8.4
+ENV CADDY_VERSION v2.9.1
 
 RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		x86_64)  binArch='amd64'; checksum='b8bec15d14fb033562af9f207850027bcbaa1f891edc9efe00d38bf39e1bf9944f8b6b8eba041ddd4c171cd70c905174c704d705be2f23bc678fe1eaf37a2485' ;; \
-		armhf)   binArch='armv6'; checksum='640536eee0645342a8cb3bfe6ca3ad5bce8a22fee371eb295192d4e95971802a4f4dbe3a188d2be577762547f713e8ac708f8e9b6acf4806cdf509ce54954eac' ;; \
-		armv7)   binArch='armv7'; checksum='8aecf8866a6dbdc46d550d2d957afc26dd262a8fa1fd6feb122df961ef57d2301b720556e6ff180f1ea0ae19e13f1cc6ea9935eae58efb68b8821aebffe989f1' ;; \
-		aarch64) binArch='arm64'; checksum='5466234be3e988071cef937aedbdd94c15b6f75cf7307397e67c2641219ac9bfe2c2bb3b31fc05bc68d3b6398bbe50abfa16ccf3b127318ccac31115ad26507c' ;; \
-		ppc64el|ppc64le) binArch='ppc64le'; checksum='90c4a779f52b86d4b615a15acdec01db986a88fb606ca11145c21cfc4e64b417296fe0a54416f2c295600f8a2994a073a40028b1b1583403b416464bf39de173' ;; \
-		riscv64) binArch='riscv64'; checksum='67ce559ca785f05b54b587f91f12f8c4c46a7d14e3f72772f14922b672417473b4e76ab61dd939b9b710889ca3a0604cd7f4c78ccba8e6dbfd5fd5193d9bf719' ;; \
-		s390x)   binArch='s390x'; checksum='ed67cecdb9f50379d75805ebeb687183f096d3206cef053b768e87eceb4472fd568f47ef8fe0939f019f38e298a3a41243ba9caa193f57e7b29e4daa700898bc' ;; \
+		x86_64)  binArch='amd64'; checksum='0412057ba591c33bdb66034d7f32209619ce635147dac3084c79abcbc118a761145e695199f57c6798d88fab077f2b0d9cb999f52ded904c6d464a4eba202932' ;; \
+		armhf)   binArch='armv6'; checksum='4553157b1b3b9e82cd5f6ce7dd5a960927c8a9f96d1c6bfb376be80407a494c9d487377d8c6f77a82e80066f052d8b4f9e2640615f9c3c855e3f53314044d565' ;; \
+		armv7)   binArch='armv7'; checksum='9650abc74b2a2f014a086536fd52f0c6827adc36e27e82ee3edd8ed2ee82c8bb8f274b5d829be1a809c632214b7d931bd5e760f4cbf87d7d31e3e8ec5f934652' ;; \
+		aarch64) binArch='arm64'; checksum='80b917c2bd8aa0892f1386ff97af9e776067dd8cdc4793238869aca7e13f7280f89d1799a1fef08b49af92dbd86684c3ba7a38b9d44afc55ef2eeb33b49e1cbd' ;; \
+		ppc64el|ppc64le) binArch='ppc64le'; checksum='93383bc8f231028810019db624e7be16754db1f3d84f6b9455f3b53275129f208f1ba3a02ee98ebd6b45e61263208d61ecb1b451c429c841988202a373423a34' ;; \
+		riscv64) binArch='riscv64'; checksum='f6707928f9b2ece9d82a6a1f9ae2154662b79bc9a0747bb0ecb0971b368a4afb1f78b44cda6a6914bc0fdbdeac601d037d5c767801dd41441377d508cf5cd3bd' ;; \
+		s390x)   binArch='s390x'; checksum='0211cfb04d172eba794831e01273414f983b2c1b28ce3c0b4e5ca829579fdbe43ec2df163f9cb951b778d8ac3579fbcb873b33963b98504fd1d0191e3866b2ac' ;; \
 		*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
 	esac; \
-	wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.8.4/caddy_2.8.4_linux_${binArch}.tar.gz"; \
+	wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.9.1/caddy_2.9.1_linux_${binArch}.tar.gz"; \
 	echo "$checksum  /tmp/caddy.tar.gz" | sha512sum -c; \
 	tar x -z -f /tmp/caddy.tar.gz -C /usr/bin caddy; \
 	rm -f /tmp/caddy.tar.gz; \
@@ -42,7 +42,7 @@ RUN set -eux; \
 ENV XDG_CONFIG_HOME /config
 ENV XDG_DATA_HOME /data
 
-LABEL org.opencontainers.image.version=v2.8.4
+LABEL org.opencontainers.image.version=v2.9.1
 LABEL org.opencontainers.image.title=Caddy
 LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
 LABEL org.opencontainers.image.url=https://caddyserver.com
diff --git a/caddy_builder-alpine/Dockerfile b/caddy_builder-alpine/Dockerfile
index 6363acd..7ea98de 100644
--- a/caddy_builder-alpine/Dockerfile
+++ b/caddy_builder-alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache \
 
 ENV XCADDY_VERSION v0.4.4
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.8.4
+ENV CADDY_VERSION v2.9.1
 # Configures xcaddy to not clean up post-build (unnecessary in a container)
 ENV XCADDY_SKIP_CLEANUP 1
 # Sets capabilities for output caddy binary to be able to bind to privileged ports
diff --git a/caddy_builder-windowsservercore-1809/Dockerfile b/caddy_builder-windowsservercore-1809/Dockerfile
index f3b1896..4b66e25 100644
--- a/caddy_builder-windowsservercore-1809/Dockerfile
+++ b/caddy_builder-windowsservercore-1809/Dockerfile
@@ -4,7 +4,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 
 ENV XCADDY_VERSION v0.4.4
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.8.4
+ENV CADDY_VERSION v2.9.1
 # Configures xcaddy to not clean up post-build (unnecessary in a container)
 ENV XCADDY_SKIP_CLEANUP 1
 
diff --git a/caddy_builder-windowsservercore-ltsc2022/Dockerfile b/caddy_builder-windowsservercore-ltsc2022/Dockerfile
index 627d6c1..864278a 100644
--- a/caddy_builder-windowsservercore-ltsc2022/Dockerfile
+++ b/caddy_builder-windowsservercore-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 
 ENV XCADDY_VERSION v0.4.4
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.8.4
+ENV CADDY_VERSION v2.9.1
 # Configures xcaddy to not clean up post-build (unnecessary in a container)
 ENV XCADDY_SKIP_CLEANUP 1
 
diff --git a/caddy_windowsservercore-1809/Dockerfile b/caddy_windowsservercore-1809/Dockerfile
index 783cfbd..8463d2b 100644
--- a/caddy_windowsservercore-1809/Dockerfile
+++ b/caddy_windowsservercore-1809/Dockerfile
@@ -7,19 +7,19 @@ RUN mkdir /config; \
     mkdir /etc/caddy; \
     mkdir /usr/share/caddy; \
     Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/config/Caddyfile" \
+        -Uri "https://github.com/caddyserver/dist/raw/33ae08ff08d168572df2956ed14fbc4949880d94/config/Caddyfile" \
         -OutFile "/etc/caddy/Caddyfile"; \
     Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/welcome/index.html" \
+        -Uri "https://github.com/caddyserver/dist/raw/33ae08ff08d168572df2956ed14fbc4949880d94/welcome/index.html" \
         -OutFile "/usr/share/caddy/index.html"
 
 # https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.8.4
+ENV CADDY_VERSION v2.9.1
 
 RUN Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.4/caddy_2.8.4_windows_amd64.zip" \
+        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.9.1/caddy_2.9.1_windows_amd64.zip" \
         -OutFile "/caddy.zip"; \
-    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('89f8fc9ece9941a15a0981b3c69543d3b9b5fe095e747875a05fc1775d4d78d4505a7fe54a58d496dade601e85f6053a00a1b0382a781d3e8b6eec044384f6e6')) { exit 1; }; \
+    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('4f0f85b42015ff2276d08705751472e6a98bdc7fda5ec76dd41b7a0c16fee90af012f1a7beb226164408cfbe656bd3453ed5ccbb596f80c45d0fa1c749fc8da2')) { exit 1; }; \
     Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \
     Remove-Item "/caddy.zip" -Force
 
@@ -27,7 +27,7 @@ RUN Invoke-WebRequest \
 ENV XDG_CONFIG_HOME c:/config
 ENV XDG_DATA_HOME c:/data
 
-LABEL org.opencontainers.image.version=v2.8.4
+LABEL org.opencontainers.image.version=v2.9.1
 LABEL org.opencontainers.image.title=Caddy
 LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
 LABEL org.opencontainers.image.url=https://caddyserver.com
diff --git a/caddy_windowsservercore-ltsc2022/Dockerfile b/caddy_windowsservercore-ltsc2022/Dockerfile
index 09cb395..ad6638f 100644
--- a/caddy_windowsservercore-ltsc2022/Dockerfile
+++ b/caddy_windowsservercore-ltsc2022/Dockerfile
@@ -7,19 +7,19 @@ RUN mkdir /config; \
     mkdir /etc/caddy; \
     mkdir /usr/share/caddy; \
     Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/config/Caddyfile" \
+        -Uri "https://github.com/caddyserver/dist/raw/33ae08ff08d168572df2956ed14fbc4949880d94/config/Caddyfile" \
         -OutFile "/etc/caddy/Caddyfile"; \
     Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/welcome/index.html" \
+        -Uri "https://github.com/caddyserver/dist/raw/33ae08ff08d168572df2956ed14fbc4949880d94/welcome/index.html" \
         -OutFile "/usr/share/caddy/index.html"
 
 # https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.8.4
+ENV CADDY_VERSION v2.9.1
 
 RUN Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.4/caddy_2.8.4_windows_amd64.zip" \
+        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.9.1/caddy_2.9.1_windows_amd64.zip" \
         -OutFile "/caddy.zip"; \
-    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('89f8fc9ece9941a15a0981b3c69543d3b9b5fe095e747875a05fc1775d4d78d4505a7fe54a58d496dade601e85f6053a00a1b0382a781d3e8b6eec044384f6e6')) { exit 1; }; \
+    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('4f0f85b42015ff2276d08705751472e6a98bdc7fda5ec76dd41b7a0c16fee90af012f1a7beb226164408cfbe656bd3453ed5ccbb596f80c45d0fa1c749fc8da2')) { exit 1; }; \
     Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \
     Remove-Item "/caddy.zip" -Force
 
@@ -27,7 +27,7 @@ RUN Invoke-WebRequest \
 ENV XDG_CONFIG_HOME c:/config
 ENV XDG_DATA_HOME c:/data
 
-LABEL org.opencontainers.image.version=v2.8.4
+LABEL org.opencontainers.image.version=v2.9.1
 LABEL org.opencontainers.image.title=Caddy
 LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
 LABEL org.opencontainers.image.url=https://caddyserver.com

Relevant Maintainers:

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