caddy: v2.7.6 release #15860

francislavoie · 2023-12-08T02:26:21Z

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

github-actions · 2023-12-08T02:27:43Z

Diff for 1fb06ed:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4208a7c..3463929 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,47 +1,47 @@
 Maintainers: Dave Henderson (@hairyhenderson)
 
-Tags: 2.7.5-alpine, 2.7-alpine, 2-alpine, alpine
-SharedTags: 2.7.5, 2.7, 2, latest
+Tags: 2.7.6-alpine, 2.7-alpine, 2-alpine, alpine
+SharedTags: 2.7.6, 2.7, 2, latest
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
+GitCommit: 4ce9344fd5c8b1f13533a3bd83b92368d6129836
 Directory: 2.7/alpine
 
-Tags: 2.7.5-builder-alpine, 2.7-builder-alpine, 2-builder-alpine, builder-alpine
-SharedTags: 2.7.5-builder, 2.7-builder, 2-builder, builder
+Tags: 2.7.6-builder-alpine, 2.7-builder-alpine, 2-builder-alpine, builder-alpine
+SharedTags: 2.7.6-builder, 2.7-builder, 2-builder, builder
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
+GitCommit: 4ce9344fd5c8b1f13533a3bd83b92368d6129836
 Directory: 2.7/builder
 
-Tags: 2.7.5-builder-windowsservercore-1809, 2.7-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
-SharedTags: 2.7.5-builder, 2.7-builder, 2-builder, builder
+Tags: 2.7.6-builder-windowsservercore-1809, 2.7-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
+SharedTags: 2.7.6-builder, 2.7-builder, 2-builder, builder
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
+GitCommit: 4ce9344fd5c8b1f13533a3bd83b92368d6129836
 Directory: 2.7/windows-builder/1809
 Constraints: windowsservercore-1809
 
-Tags: 2.7.5-builder-windowsservercore-ltsc2022, 2.7-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
-SharedTags: 2.7.5-builder, 2.7-builder, 2-builder, builder
+Tags: 2.7.6-builder-windowsservercore-ltsc2022, 2.7-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
+SharedTags: 2.7.6-builder, 2.7-builder, 2-builder, builder
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
+GitCommit: 4ce9344fd5c8b1f13533a3bd83b92368d6129836
 Directory: 2.7/windows-builder/ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 2.7.5-windowsservercore-1809, 2.7-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
-SharedTags: 2.7.5-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.5, 2.7, 2, latest
+Tags: 2.7.6-windowsservercore-1809, 2.7-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
+SharedTags: 2.7.6-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.6, 2.7, 2, latest
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
+GitCommit: 4ce9344fd5c8b1f13533a3bd83b92368d6129836
 Directory: 2.7/windows/1809
 Constraints: windowsservercore-1809
 
-Tags: 2.7.5-windowsservercore-ltsc2022, 2.7-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 2.7.5-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.5, 2.7, 2, latest
+Tags: 2.7.6-windowsservercore-ltsc2022, 2.7-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 2.7.6-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.6, 2.7, 2, latest
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
+GitCommit: 4ce9344fd5c8b1f13533a3bd83b92368d6129836
 Directory: 2.7/windows/ltsc2022
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 75ead61..905a2fa 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -16,15 +16,15 @@ caddy:2.7-builder-windowsservercore-ltsc2022
 caddy:2.7-windowsservercore
 caddy:2.7-windowsservercore-1809
 caddy:2.7-windowsservercore-ltsc2022
-caddy:2.7.5
-caddy:2.7.5-alpine
-caddy:2.7.5-builder
-caddy:2.7.5-builder-alpine
-caddy:2.7.5-builder-windowsservercore-1809
-caddy:2.7.5-builder-windowsservercore-ltsc2022
-caddy:2.7.5-windowsservercore
-caddy:2.7.5-windowsservercore-1809
-caddy:2.7.5-windowsservercore-ltsc2022
+caddy:2.7.6
+caddy:2.7.6-alpine
+caddy:2.7.6-builder
+caddy:2.7.6-builder-alpine
+caddy:2.7.6-builder-windowsservercore-1809
+caddy:2.7.6-builder-windowsservercore-ltsc2022
+caddy:2.7.6-windowsservercore
+caddy:2.7.6-windowsservercore-1809
+caddy:2.7.6-windowsservercore-ltsc2022
 caddy:alpine
 caddy:builder
 caddy:builder-alpine
diff --git a/caddy_alpine/Dockerfile b/caddy_alpine/Dockerfile
index 38d455a..b81cce8 100644
--- a/caddy_alpine/Dockerfile
+++ b/caddy_alpine/Dockerfile
@@ -12,24 +12,24 @@ RUN set -eux; \
 		/etc/caddy \
 		/usr/share/caddy \
 	; \
-	wget -O /etc/caddy/Caddyfile "https://github.com/caddyserver/dist/raw/0c7fa00a87c65a6ef47ed36d841cd223682a2a2c/config/Caddyfile"; \
-	wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/0c7fa00a87c65a6ef47ed36d841cd223682a2a2c/welcome/index.html"
+	wget -O /etc/caddy/Caddyfile "https://github.com/caddyserver/dist/raw/cd39178d252a610fee6aa8465c787d9c780007a2/config/Caddyfile"; \
+	wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/cd39178d252a610fee6aa8465c787d9c780007a2/welcome/index.html"
 
 # https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.7.5
+ENV CADDY_VERSION v2.7.6
 
 RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		x86_64)  binArch='amd64'; checksum='4afdf50ccf3a8f32344dbac46006ca2b5d90c2ef656c53e8617f1c3b81c5f9e44bd3a9e0b62975f73c85451c354d3d9b5292f5247d18a62d95ab19c8b0a5dba7' ;; \
-		armhf)   binArch='armv6'; checksum='5f47b4ff5d290799bba1b9183c6ddfe7fee69c8086375337a7498717ce09fc627845f6cb466840daf539c763979ab60fe229b9ddeaf7f92fad800742d4ad5b3a' ;; \
-		armv7)   binArch='armv7'; checksum='bdd120779427cf288a383ecf9d63fa6b61e2118f189e02263ad45989bae507ce1db84ced60de3b33653e9729166e4ca436785503558955b9934be69138184055' ;; \
-		aarch64) binArch='arm64'; checksum='a857cbe25bcc5402e9c4fa2a6c36338f91b7e23962beedccd32e10b3aa34dda084ae742c79085d6e7581acfe33f7c9cf161224b1e56cdb661ebfb6f7424b8d0a' ;; \
-		ppc64el|ppc64le) binArch='ppc64le'; checksum='72c66d44cfc8f8d248e04f08903866d62a0e11c36b51c49c08c73c833a3f4322a780405543e721dcf375b71dee06e90230c64141efb2a9614f551e2134f120a9' ;; \
-		s390x)   binArch='s390x'; checksum='5fb95fb495da282330f34b7f23fff3e664638397dcde2c33a3c7450e448154425b2514573604be3cac03d30b37444c4866170f232f14a33e50bff0d1e1abf126' ;; \
+		x86_64)  binArch='amd64'; checksum='b74311ec8263f30f6d36e5c8be151e8bc092b377789a55300d5671238b9043de5bd6db2bcefae32aa1e6fe94c47bbf02982c44a7871e5777b2596fdb20907cbf' ;; \
+		armhf)   binArch='armv6'; checksum='88756642ca412db3a8da7a40b518861a6f524a8ac704021e8451d3cb38746f24243b1e561f4eec07e1575200d06bfd098783d2b7ee7ee07a971aed1c677da6e6' ;; \
+		armv7)   binArch='armv7'; checksum='118776e879c280556abb7c03ff7c0081eda23c2aee0472aef176f733785e9501defaeaf334cd2443e31294809beafaea831d2e695aa68045160082aa3a966e2f' ;; \
+		aarch64) binArch='arm64'; checksum='62252ade5e8dcec13a66154ee1978d959370be049cce52e7c4edefff14ef70bbb21630e3735092719bc3c31214e89dff99e55970ff0adec8ac0a94c6415b059a' ;; \
+		ppc64el|ppc64le) binArch='ppc64le'; checksum='65d27fe53f5e4fa79f3476f8902071c907aab74db1a2616342be3714d4252219fbb53b174ef588e20c51e7cfac84376c7a0a608091c2fe83b31dbf59dabeb237' ;; \
+		s390x)   binArch='s390x'; checksum='c562190962a2db0248a4190616dd2ebaa02df2cf62f1a2c71f9d9de18af2a297df8000a06a11e8d3929dfd64f0c081d1e61961687ca220007459f2dbd0be2c81' ;; \
 		*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
 	esac; \
-	wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.7.5/caddy_2.7.5_linux_${binArch}.tar.gz"; \
+	wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.7.6/caddy_2.7.6_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; \
@@ -41,7 +41,7 @@ RUN set -eux; \
 ENV XDG_CONFIG_HOME /config
 ENV XDG_DATA_HOME /data
 
-LABEL org.opencontainers.image.version=v2.7.5
+LABEL org.opencontainers.image.version=v2.7.6
 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 eba5de0..9db92e4 100644
--- a/caddy_builder-alpine/Dockerfile
+++ b/caddy_builder-alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache \
 
 ENV XCADDY_VERSION v0.3.5
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.7.5
+ENV CADDY_VERSION v2.7.6
 # 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 6f36dde..0001678 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.3.5
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.7.5
+ENV CADDY_VERSION v2.7.6
 # 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 0b041de..15f1582 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.3.5
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.7.5
+ENV CADDY_VERSION v2.7.6
 # 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 dc08894..57ef18c 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/0c7fa00a87c65a6ef47ed36d841cd223682a2a2c/config/Caddyfile" \
+        -Uri "https://github.com/caddyserver/dist/raw/cd39178d252a610fee6aa8465c787d9c780007a2/config/Caddyfile" \
         -OutFile "/etc/caddy/Caddyfile"; \
     Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/dist/raw/0c7fa00a87c65a6ef47ed36d841cd223682a2a2c/welcome/index.html" \
+        -Uri "https://github.com/caddyserver/dist/raw/cd39178d252a610fee6aa8465c787d9c780007a2/welcome/index.html" \
         -OutFile "/usr/share/caddy/index.html"
 
 # https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.7.5
+ENV CADDY_VERSION v2.7.6
 
 RUN Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.5/caddy_2.7.5_windows_amd64.zip" \
+        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.6/caddy_2.7.6_windows_amd64.zip" \
         -OutFile "/caddy.zip"; \
-    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('3201e91a00d8c49acf6165753df34fccfb9c0eacb610b0dad5e5c465cdaced761b061f0c7fc200ce4e87f4acfbd6421e9b3e0121ba293532f4afdf7c9c9c96a0')) { exit 1; }; \
+    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('b2321473be1da500a8f6e4276aed03b11946e3758b792a3e9ba50c07246456d64d7da931d6d58be43e6d3cfd07c1ad68f6838df8e090bd5d212224a9bf94daec')) { 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.7.5
+LABEL org.opencontainers.image.version=v2.7.6
 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 bd3423d..cd521a5 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/0c7fa00a87c65a6ef47ed36d841cd223682a2a2c/config/Caddyfile" \
+        -Uri "https://github.com/caddyserver/dist/raw/cd39178d252a610fee6aa8465c787d9c780007a2/config/Caddyfile" \
         -OutFile "/etc/caddy/Caddyfile"; \
     Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/dist/raw/0c7fa00a87c65a6ef47ed36d841cd223682a2a2c/welcome/index.html" \
+        -Uri "https://github.com/caddyserver/dist/raw/cd39178d252a610fee6aa8465c787d9c780007a2/welcome/index.html" \
         -OutFile "/usr/share/caddy/index.html"
 
 # https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.7.5
+ENV CADDY_VERSION v2.7.6
 
 RUN Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.5/caddy_2.7.5_windows_amd64.zip" \
+        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.6/caddy_2.7.6_windows_amd64.zip" \
         -OutFile "/caddy.zip"; \
-    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('3201e91a00d8c49acf6165753df34fccfb9c0eacb610b0dad5e5c465cdaced761b061f0c7fc200ce4e87f4acfbd6421e9b3e0121ba293532f4afdf7c9c9c96a0')) { exit 1; }; \
+    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('b2321473be1da500a8f6e4276aed03b11946e3758b792a3e9ba50c07246456d64d7da931d6d58be43e6d3cfd07c1ad68f6838df8e090bd5d212224a9bf94daec')) { 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.7.5
+LABEL org.opencontainers.image.version=v2.7.6
 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:

caddy: @hairyhenderson

francislavoie · 2023-12-08T02:29:22Z

I'm making the PR this time to test our tooling in https://github.com/caddyserver/caddy-docker to improve bus factor. I'm not listed as a maintainer in the stackbrew, is that a problem?

hairyhenderson · 2023-12-08T02:31:27Z

LGTM!

yosifkit · 2023-12-08T18:53:27Z

I'm not listed as a maintainer in the stackbrew, is that a problem?

Not a problem, if the image maintainer, @hairyhenderson, approves, then it is fine. In the absence of a maintainer approval, I will also check upstream (docker image repo, and caddy upstream) maintainership/ownership to see if the PR author is authoritative (and take into account past PRs here as well).

francislavoie · 2023-12-08T18:57:26Z

Cool, thanks!

I'll probably add myself as a maintainer is the stackbrew for the next release.

Caddy v2.7.6

1fb06ed

github-actions bot added the library/caddy label Dec 8, 2023

yosifkit approved these changes Dec 8, 2023

View reviewed changes

yosifkit merged commit 4b1eb12 into docker-library:master Dec 8, 2023
11 checks passed

francislavoie deleted the patch-1 branch December 8, 2023 19:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

caddy: v2.7.6 release #15860

caddy: v2.7.6 release #15860

francislavoie commented Dec 8, 2023

github-actions bot commented Dec 8, 2023

francislavoie commented Dec 8, 2023 •

edited

Loading

hairyhenderson commented Dec 8, 2023

yosifkit commented Dec 8, 2023

francislavoie commented Dec 8, 2023

caddy: v2.7.6 release #15860

caddy: v2.7.6 release #15860

Conversation

francislavoie commented Dec 8, 2023

github-actions bot commented Dec 8, 2023

francislavoie commented Dec 8, 2023 • edited Loading

hairyhenderson commented Dec 8, 2023

yosifkit commented Dec 8, 2023

francislavoie commented Dec 8, 2023

francislavoie commented Dec 8, 2023 •

edited

Loading