From fb6e8723745c60fe413a311b484704e8ce3fcfd3 Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Sun, 2 Jun 2024 23:28:41 -0400 Subject: [PATCH] Caddy v2.8.4 --- 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 2311781..bcf7cfd 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.1 +ENV CADDY_VERSION v2.8.4 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - 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' ;; \ + 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' ;; \ + s390x) binArch='s390x'; checksum='ed67cecdb9f50379d75805ebeb687183f096d3206cef053b768e87eceb4472fd568f47ef8fe0939f019f38e298a3a41243ba9caa193f57e7b29e4daa700898bc' ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\ esac; \ - wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.8.1/caddy_2.8.1_linux_${binArch}.tar.gz"; \ + wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.8.4/caddy_2.8.4_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.1 +LABEL org.opencontainers.image.version=v2.8.4 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 f57198d..5a54a25 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.1 +ENV CADDY_VERSION v2.8.4 # 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 2105605..a09463c 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.1 +ENV CADDY_VERSION v2.8.4 # 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 5819af8..1671a5a 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.1 +ENV CADDY_VERSION v2.8.4 # 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 17c7566..783cfbd 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.1 +ENV CADDY_VERSION v2.8.4 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.1/caddy_2.8.1_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.4/caddy_2.8.4_windows_amd64.zip" \ -OutFile "/caddy.zip"; \ - if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('d7d2afd6e9d47990b47194c2ca2a385fefe1c5381e0c98d41d799e9f9a797072916b3db17e7c990f792532edeab52cc0cfa399eb907a79b44e1d94d50bae089c')) { exit 1; }; \ + if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('89f8fc9ece9941a15a0981b3c69543d3b9b5fe095e747875a05fc1775d4d78d4505a7fe54a58d496dade601e85f6053a00a1b0382a781d3e8b6eec044384f6e6')) { 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.1 +LABEL org.opencontainers.image.version=v2.8.4 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 ad5a50c..09cb395 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.1 +ENV CADDY_VERSION v2.8.4 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.1/caddy_2.8.1_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.4/caddy_2.8.4_windows_amd64.zip" \ -OutFile "/caddy.zip"; \ - if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('d7d2afd6e9d47990b47194c2ca2a385fefe1c5381e0c98d41d799e9f9a797072916b3db17e7c990f792532edeab52cc0cfa399eb907a79b44e1d94d50bae089c')) { exit 1; }; \ + if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('89f8fc9ece9941a15a0981b3c69543d3b9b5fe095e747875a05fc1775d4d78d4505a7fe54a58d496dade601e85f6053a00a1b0382a781d3e8b6eec044384f6e6')) { 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.1 +LABEL org.opencontainers.image.version=v2.8.4 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 b5c139e..58d3a2e 100644 --- a/stackbrew-config.yaml +++ b/stackbrew-config.yaml @@ -1,5 +1,5 @@ versions: - - caddy_version: '2.8.1' + - caddy_version: '2.8.4' is_major: true is_latest: true dist_commit: 509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4