From 570892add07e6249c94e89c36b67e0e01b0b656d Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Thu, 30 May 2024 10:50:16 -0400 Subject: [PATCH] Caddy v2.8.1 (#353) --- 2.8/alpine/Dockerfile | 18 +++++++++--------- 2.8/builder/Dockerfile | 2 +- 2.8/windows-builder/1809/Dockerfile | 2 +- 2.8/windows-builder/ltsc2022/Dockerfile | 2 +- 2.8/windows/1809/Dockerfile | 8 ++++---- 2.8/windows/ltsc2022/Dockerfile | 8 ++++---- stackbrew-config.yaml | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/2.8/alpine/Dockerfile b/2.8/alpine/Dockerfile index 07ba64a..2311781 100644 --- a/2.8/alpine/Dockerfile +++ b/2.8/alpine/Dockerfile @@ -16,20 +16,20 @@ RUN set -eux; \ wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/welcome/index.html" # https://github.com/caddyserver/caddy/releases -ENV CADDY_VERSION v2.8.0 +ENV CADDY_VERSION v2.8.1 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - x86_64) binArch='amd64'; checksum='90d7f2325f9f6feec22c2c84fb1bdad2e94ae08b227d3c44eaa6b82ce1ff5a31fedc047d95e4a0ec2df4c1cebf3426cf6003c9f1d665ba3e67093bc12b89606a' ;; \ - armhf) binArch='armv6'; checksum='93a0467fe0945dfc12e86a22b161a8d230b9bd728db39293fae32175b438e04726d6a4f8d432b42db4fb48bae10227e0b1a714667f636f669c707e7996671724' ;; \ - armv7) binArch='armv7'; checksum='98a7a06cf1202c6bc484907d255c1afd5302a38a6ed15a0fccebb1be861bceab2f496ffacc796a144e637dbac4f0de4494eb53952e5a8e37532e19aa58c6679a' ;; \ - aarch64) binArch='arm64'; checksum='37e6b62ebf76cac029204cd906dba72fd68ed302079dd4828efc2ade7aed746d8fc4aa301ceb8d1fbe277973247df563c8fa51d815c4c2e8f18f88cfefc1c40a' ;; \ - ppc64el|ppc64le) binArch='ppc64le'; checksum='6156c44046e4e0b892c6ff79af387d86f96c0f1a2306f4496ba2b00f03d195e40f805c8f2c95a4f05293cbf283de23285ed94cea7eaeae1c4f910295a6c78c07' ;; \ - s390x) binArch='s390x'; checksum='e9199812aba23ed037d2d2cc75f01a9a9c583a31bcc2b7ef336b646548e3e460a78a606397ed61c570b8ba5e352bf44affafd3eb9d66656f31d2263ac8275ca1' ;; \ + x86_64) binArch='amd64'; checksum='866b6186626d4a7f35d5c010f3f532b022a35dd21f3512bd2015d6de39add0ccc0e8f778878a927ea4a5131ed1dfa8f114b1b9831eaa741f8aebc5c2d88747fd' ;; \ + armhf) binArch='armv6'; checksum='7cb786e8f1af7573ece485f2a9348c3ba7c6191346f5917075027f5cf5309fc0b8e3113e48092fc723d01171cd3c8bdfd076af17e69b1a6c1a9a0d5e53fdf1d2' ;; \ + armv7) binArch='armv7'; checksum='e1a7c02a0986d260ead1ffa9023e78bc1903139813ef5233a06d1f7d621f71ce37eb0042a991287256f85dae64924278514d183bcd805ef0329a096e4574dc06' ;; \ + aarch64) binArch='arm64'; checksum='1a619b1ad15fc2163fa597a00b2c6174e6d00b8ce5206d18e0691edf9251ac8dcf1ebf059d7bd065a9ce0b3427071943dd2385d27fa78df0678cefea07280154' ;; \ + ppc64el|ppc64le) binArch='ppc64le'; checksum='c6d9b6a8db14b4a44de453023ae7b9d6f85b646dfb22a7e4bd5859556fb9cc42e1fb16b3ea5312a2b97bce4ab1f87a71daa430dc57cea09c0dea739409d5434f' ;; \ + s390x) binArch='s390x'; checksum='312ff46594f445d643acbc0d2f118c5af9419dd9e2ea1a8398a8a7772d172ec616d79f83eb4e3550efd26188c3fa1ddff1d9255bb3a55fe6b4384b0db818502a' ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\ esac; \ - wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.8.0/caddy_2.8.0_linux_${binArch}.tar.gz"; \ + wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.8.1/caddy_2.8.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; \ @@ -41,7 +41,7 @@ RUN set -eux; \ ENV XDG_CONFIG_HOME /config ENV XDG_DATA_HOME /data -LABEL org.opencontainers.image.version=v2.8.0 +LABEL org.opencontainers.image.version=v2.8.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/2.8/builder/Dockerfile b/2.8/builder/Dockerfile index 9112c8a..f57198d 100644 --- a/2.8/builder/Dockerfile +++ b/2.8/builder/Dockerfile @@ -7,7 +7,7 @@ RUN apk add --no-cache \ ENV XCADDY_VERSION v0.4.2 # Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.8.0 +ENV CADDY_VERSION v2.8.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/2.8/windows-builder/1809/Dockerfile b/2.8/windows-builder/1809/Dockerfile index 691a2e8..2105605 100644 --- a/2.8/windows-builder/1809/Dockerfile +++ b/2.8/windows-builder/1809/Dockerfile @@ -4,7 +4,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV XCADDY_VERSION v0.4.2 # Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.8.0 +ENV CADDY_VERSION v2.8.1 # Configures xcaddy to not clean up post-build (unnecessary in a container) ENV XCADDY_SKIP_CLEANUP 1 diff --git a/2.8/windows-builder/ltsc2022/Dockerfile b/2.8/windows-builder/ltsc2022/Dockerfile index 61224f2..5819af8 100644 --- a/2.8/windows-builder/ltsc2022/Dockerfile +++ b/2.8/windows-builder/ltsc2022/Dockerfile @@ -4,7 +4,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref ENV XCADDY_VERSION v0.4.2 # Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.8.0 +ENV CADDY_VERSION v2.8.1 # Configures xcaddy to not clean up post-build (unnecessary in a container) ENV XCADDY_SKIP_CLEANUP 1 diff --git a/2.8/windows/1809/Dockerfile b/2.8/windows/1809/Dockerfile index e0d9b5d..17c7566 100644 --- a/2.8/windows/1809/Dockerfile +++ b/2.8/windows/1809/Dockerfile @@ -14,12 +14,12 @@ RUN mkdir /config; \ -OutFile "/usr/share/caddy/index.html" # https://github.com/caddyserver/caddy/releases -ENV CADDY_VERSION v2.8.0 +ENV CADDY_VERSION v2.8.1 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.0/caddy_2.8.0_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.1/caddy_2.8.1_windows_amd64.zip" \ -OutFile "/caddy.zip"; \ - if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('403789c4e18a53e5f6d0d170de4d8784b84821a4b3c739b9799863019d10ebd5e90af82588d0ea036611f6e0907e2b144b76a33c7dbf23d05d51ab63d990a0d0')) { exit 1; }; \ + if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('d7d2afd6e9d47990b47194c2ca2a385fefe1c5381e0c98d41d799e9f9a797072916b3db17e7c990f792532edeab52cc0cfa399eb907a79b44e1d94d50bae089c')) { 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.0 +LABEL org.opencontainers.image.version=v2.8.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/2.8/windows/ltsc2022/Dockerfile b/2.8/windows/ltsc2022/Dockerfile index 12f90e7..ad5a50c 100644 --- a/2.8/windows/ltsc2022/Dockerfile +++ b/2.8/windows/ltsc2022/Dockerfile @@ -14,12 +14,12 @@ RUN mkdir /config; \ -OutFile "/usr/share/caddy/index.html" # https://github.com/caddyserver/caddy/releases -ENV CADDY_VERSION v2.8.0 +ENV CADDY_VERSION v2.8.1 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.0/caddy_2.8.0_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.1/caddy_2.8.1_windows_amd64.zip" \ -OutFile "/caddy.zip"; \ - if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('403789c4e18a53e5f6d0d170de4d8784b84821a4b3c739b9799863019d10ebd5e90af82588d0ea036611f6e0907e2b144b76a33c7dbf23d05d51ab63d990a0d0')) { exit 1; }; \ + if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('d7d2afd6e9d47990b47194c2ca2a385fefe1c5381e0c98d41d799e9f9a797072916b3db17e7c990f792532edeab52cc0cfa399eb907a79b44e1d94d50bae089c')) { 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.0 +LABEL org.opencontainers.image.version=v2.8.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/stackbrew-config.yaml b/stackbrew-config.yaml index 1615d8f..b5c139e 100644 --- a/stackbrew-config.yaml +++ b/stackbrew-config.yaml @@ -1,5 +1,5 @@ versions: - - caddy_version: '2.8.0' + - caddy_version: '2.8.1' is_major: true is_latest: true dist_commit: 509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4