From 8e45629b3f219609ebd9ae2dfb70df0e73765b5f Mon Sep 17 00:00:00 2001 From: Francis Lavoie Date: Wed, 29 May 2024 17:22:21 -0400 Subject: [PATCH] Caddy v2.8.0 (#351) --- .github/dependabot.yml | 42 -------------- .github/workflows/docker.yml | 6 +- 2.7/alpine/Dockerfile | 60 -------------------- 2.7/alpine/Dockerfile.base | 1 - 2.7/builder/Caddyfile | 5 -- 2.7/builder/Dockerfile | 35 ------------ 2.7/builder/Dockerfile.base | 1 - 2.7/builder/caddy-builder.sh | 17 ------ 2.7/windows-builder/1809/Dockerfile | 18 ------ 2.7/windows-builder/1809/Dockerfile.base | 1 - 2.7/windows-builder/ltsc2022/Dockerfile | 18 ------ 2.7/windows-builder/ltsc2022/Dockerfile.base | 1 - 2.7/windows/1809/Dockerfile | 47 --------------- 2.7/windows/1809/Dockerfile.base | 1 - 2.7/windows/ltsc2022/Dockerfile | 47 --------------- 2.7/windows/ltsc2022/Dockerfile.base | 1 - 2.8/alpine/Dockerfile | 18 +++--- 2.8/builder/Dockerfile | 20 +++---- 2.8/builder/Dockerfile.base | 2 +- 2.8/windows-builder/1809/Dockerfile | 8 +-- 2.8/windows-builder/ltsc2022/Dockerfile | 8 +-- 2.8/windows/1809/Dockerfile | 8 +-- 2.8/windows/ltsc2022/Dockerfile | 8 +-- stackbrew-config.yaml | 8 +-- 24 files changed, 41 insertions(+), 340 deletions(-) delete mode 100644 2.7/alpine/Dockerfile delete mode 100644 2.7/alpine/Dockerfile.base delete mode 100644 2.7/builder/Caddyfile delete mode 100644 2.7/builder/Dockerfile delete mode 100644 2.7/builder/Dockerfile.base delete mode 100755 2.7/builder/caddy-builder.sh delete mode 100644 2.7/windows-builder/1809/Dockerfile delete mode 100644 2.7/windows-builder/1809/Dockerfile.base delete mode 100644 2.7/windows-builder/ltsc2022/Dockerfile delete mode 100644 2.7/windows-builder/ltsc2022/Dockerfile.base delete mode 100644 2.7/windows/1809/Dockerfile delete mode 100644 2.7/windows/1809/Dockerfile.base delete mode 100644 2.7/windows/ltsc2022/Dockerfile delete mode 100644 2.7/windows/ltsc2022/Dockerfile.base diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 18d2448..3ac8888 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,47 +1,5 @@ version: 2 updates: -- package-ecosystem: docker - directory: "/2.7/alpine" - schedule: - interval: daily - time: "02:00" - timezone: UTC - open-pull-requests-limit: 10 -- package-ecosystem: docker - directory: "/2.7/builder" - schedule: - interval: daily - time: "02:00" - timezone: UTC - open-pull-requests-limit: 10 -- package-ecosystem: docker - directory: "/2.7/windows/1809" - schedule: - interval: daily - time: "02:00" - timezone: UTC - open-pull-requests-limit: 10 -- package-ecosystem: docker - directory: "/2.7/windows/ltsc2022" - schedule: - interval: daily - time: "02:00" - timezone: UTC - open-pull-requests-limit: 10 -- package-ecosystem: docker - directory: "/2.7/windows-builder/1809" - schedule: - interval: daily - time: "02:00" - timezone: UTC - open-pull-requests-limit: 10 -- package-ecosystem: docker - directory: "/2.7/windows-builder/ltsc2022" - schedule: - interval: daily - time: "02:00" - timezone: UTC - open-pull-requests-limit: 10 - package-ecosystem: docker directory: "/2.8/alpine" schedule: diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 552ab28..69de6a1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -18,8 +18,8 @@ jobs: - uses: actions/checkout@master - name: non-master build test run: | - docker build -f 2.7/alpine/Dockerfile 2.7/alpine - docker build -f 2.7/builder/Dockerfile 2.7/builder + docker build -f 2.8/alpine/Dockerfile 2.8/alpine + docker build -f 2.8/builder/Dockerfile 2.8/builder if: github.repository != 'caddyserver/caddy-docker' || github.ref != 'refs/heads/master' - name: build run: bashbrew build caddy @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@master - name: non-master build test run: | - docker build -f 2.7/windows/1809/Dockerfile 2.7/windows + docker build -f 2.8/windows/1809/Dockerfile 2.8/windows if: github.repository != 'caddyserver/caddy-docker' || github.ref != 'refs/heads/master' - name: install bashbrew run: curl -o /bashbrew.exe https://doi-janky.infosiftr.net/job/bashbrew/job/master/lastSuccessfulBuild/artifact/bashbrew-windows-amd64.exe diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile deleted file mode 100644 index 8ab9ab6..0000000 --- a/2.7/alpine/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -FROM alpine:3.18 - -RUN apk add --no-cache \ - ca-certificates \ - libcap \ - mailcap - -RUN set -eux; \ - mkdir -p \ - /config/caddy \ - /data/caddy \ - /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" - -# https://github.com/caddyserver/caddy/releases -ENV CADDY_VERSION v2.7.6 - -RUN set -eux; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - 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.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; \ - setcap cap_net_bind_service=+ep /usr/bin/caddy; \ - chmod +x /usr/bin/caddy; \ - caddy version - -# See https://caddyserver.com/docs/conventions#file-locations for details -ENV XDG_CONFIG_HOME /config -ENV XDG_DATA_HOME /data - -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 -LABEL org.opencontainers.image.documentation=https://caddyserver.com/docs -LABEL org.opencontainers.image.vendor="Light Code Labs" -LABEL org.opencontainers.image.licenses=Apache-2.0 -LABEL org.opencontainers.image.source="https://github.com/caddyserver/caddy-docker" - -EXPOSE 80 -EXPOSE 443 -EXPOSE 443/udp -EXPOSE 2019 - -WORKDIR /srv - -CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"] diff --git a/2.7/alpine/Dockerfile.base b/2.7/alpine/Dockerfile.base deleted file mode 100644 index eef8a9f..0000000 --- a/2.7/alpine/Dockerfile.base +++ /dev/null @@ -1 +0,0 @@ -FROM alpine:3.18 diff --git a/2.7/builder/Caddyfile b/2.7/builder/Caddyfile deleted file mode 100644 index 14ff433..0000000 --- a/2.7/builder/Caddyfile +++ /dev/null @@ -1,5 +0,0 @@ -:80 - -route { - teapot -} diff --git a/2.7/builder/Dockerfile b/2.7/builder/Dockerfile deleted file mode 100644 index d89de83..0000000 --- a/2.7/builder/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM golang:1.21-alpine3.18 - -RUN apk add --no-cache \ - ca-certificates \ - git \ - libcap - -ENV XCADDY_VERSION v0.4.1 -# Configures xcaddy to build with this version of Caddy -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 -ENV XCADDY_SETCAP 1 - -RUN set -eux; \ - apkArch="$(apk --print-arch)"; \ - case "$apkArch" in \ - x86_64) binArch='amd64'; checksum='d4866142b2c816dce25685b68af6aa4b65aab01090eb58ffbe963b854f83d3d9ea8c46381d888d5435b8ff971c65878236c23aa9891586a2a69b495fc910b342' ;; \ - armhf) binArch='armv6'; checksum='f3aa9db51a9130ba78da70ef026986ca51df3365449e5b0df6fa8c7bc3f88ad03b6a4072e61a0065fffe115511645c3b31f1deff0aa7590e2f7bab853bda9b3b' ;; \ - armv7) binArch='armv7'; checksum='1c007bd092b2422432e2db7d5c3ecc422c54af669e57bc16df316baadd9857ad4be960852ffd08af9b5530ff31218c458bde3961554fb1218f8519349b6949e7' ;; \ - aarch64) binArch='arm64'; checksum='8d2462a174f2caf092b0d3ced612d0cd352a0afba736b0b81ca100c5ffbdb09b6d1978f49db7b1953e559eae42956912f20f59995112813b120217a624a21893' ;; \ - ppc64el|ppc64le) binArch='ppc64le'; checksum='e99b53e5dd805dc4e06ada2af7fc417a3073e24cba25d400395aa28f385be80db4f4b95ce8548be91c7d668f3a331dcf2293d295f903bf0703e1ca8a95ba47cb' ;; \ - s390x) binArch='s390x'; checksum='edadaa2aa6ff491517697ab887fbe3909026d7085dff772d754fb93d02a5008b344aeed995088bb79afb8b1cc01ed1c96af7b832c0b6888f1c5bedd3d567c4f6' ;; \ - *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\ - esac; \ - wget -O /tmp/xcaddy.tar.gz "https://github.com/caddyserver/xcaddy/releases/download/v0.4.1/xcaddy_0.4.1_linux_${binArch}.tar.gz"; \ - echo "$checksum /tmp/xcaddy.tar.gz" | sha512sum -c; \ - tar x -z -f /tmp/xcaddy.tar.gz -C /usr/bin xcaddy; \ - rm -f /tmp/xcaddy.tar.gz; \ - chmod +x /usr/bin/xcaddy; - -COPY caddy-builder.sh /usr/bin/caddy-builder - -WORKDIR /usr/bin diff --git a/2.7/builder/Dockerfile.base b/2.7/builder/Dockerfile.base deleted file mode 100644 index cef39d9..0000000 --- a/2.7/builder/Dockerfile.base +++ /dev/null @@ -1 +0,0 @@ -FROM golang:1.21-alpine3.18 diff --git a/2.7/builder/caddy-builder.sh b/2.7/builder/caddy-builder.sh deleted file mode 100755 index cd4b699..0000000 --- a/2.7/builder/caddy-builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -eu - -args="" -for p; do - args="$args --with $p" -done - -echo "Warning: the caddy-builder script is deprecated and will be removed in the future. -Instead, you should use the xcaddy command: - - xcaddy build $args -" >&2 - -# version is inferred from $CADDY_VERSION (set in the Dockerfile) -# output will be placed in the working dir (/usr/bin as set in the Dockerfile) -xcaddy build $args diff --git a/2.7/windows-builder/1809/Dockerfile b/2.7/windows-builder/1809/Dockerfile deleted file mode 100644 index 1185dfc..0000000 --- a/2.7/windows-builder/1809/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM golang:1.21-windowsservercore-1809 - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV XCADDY_VERSION v0.4.1 -# Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.7.6 -# Configures xcaddy to not clean up post-build (unnecessary in a container) -ENV XCADDY_SKIP_CLEANUP 1 - -RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.1/xcaddy_0.4.1_windows_amd64.zip" \ - -OutFile "/xcaddy.zip"; \ - if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('b058280b1e15e0915c541bc8a3aefc2289155c38a9fbc2f8d6b05267f9d0469eae5be2a9312d52c5ba41c7dbcb18c0970efa5b1df628655cca81b55d5c51d9e1')) { exit 1; }; \ - Expand-Archive -Path "/xcaddy.zip" -DestinationPath "/" -Force; \ - Remove-Item "/xcaddy.zip" -Force - -WORKDIR / diff --git a/2.7/windows-builder/1809/Dockerfile.base b/2.7/windows-builder/1809/Dockerfile.base deleted file mode 100644 index 56c35b7..0000000 --- a/2.7/windows-builder/1809/Dockerfile.base +++ /dev/null @@ -1 +0,0 @@ -FROM golang:1.21-windowsservercore-1809 diff --git a/2.7/windows-builder/ltsc2022/Dockerfile b/2.7/windows-builder/ltsc2022/Dockerfile deleted file mode 100644 index 33d6321..0000000 --- a/2.7/windows-builder/ltsc2022/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM golang:1.21-windowsservercore-ltsc2022 - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV XCADDY_VERSION v0.4.1 -# Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.7.6 -# Configures xcaddy to not clean up post-build (unnecessary in a container) -ENV XCADDY_SKIP_CLEANUP 1 - -RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.1/xcaddy_0.4.1_windows_amd64.zip" \ - -OutFile "/xcaddy.zip"; \ - if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('b058280b1e15e0915c541bc8a3aefc2289155c38a9fbc2f8d6b05267f9d0469eae5be2a9312d52c5ba41c7dbcb18c0970efa5b1df628655cca81b55d5c51d9e1')) { exit 1; }; \ - Expand-Archive -Path "/xcaddy.zip" -DestinationPath "/" -Force; \ - Remove-Item "/xcaddy.zip" -Force - -WORKDIR / diff --git a/2.7/windows-builder/ltsc2022/Dockerfile.base b/2.7/windows-builder/ltsc2022/Dockerfile.base deleted file mode 100644 index e5ff4ad..0000000 --- a/2.7/windows-builder/ltsc2022/Dockerfile.base +++ /dev/null @@ -1 +0,0 @@ -FROM golang:1.21-windowsservercore-ltsc2022 diff --git a/2.7/windows/1809/Dockerfile b/2.7/windows/1809/Dockerfile deleted file mode 100644 index cb99e71..0000000 --- a/2.7/windows/1809/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:1809 - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN mkdir /config; \ - mkdir /data; \ - mkdir /etc/caddy; \ - mkdir /usr/share/caddy; \ - Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/config/Caddyfile" \ - -OutFile "/etc/caddy/Caddyfile"; \ - Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/welcome/index.html" \ - -OutFile "/usr/share/caddy/index.html" - -# https://github.com/caddyserver/caddy/releases -ENV CADDY_VERSION v2.7.6 - -RUN Invoke-WebRequest \ - -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('b2321473be1da500a8f6e4276aed03b11946e3758b792a3e9ba50c07246456d64d7da931d6d58be43e6d3cfd07c1ad68f6838df8e090bd5d212224a9bf94daec')) { exit 1; }; \ - Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \ - Remove-Item "/caddy.zip" -Force - -# See https://caddyserver.com/docs/conventions#file-locations for details -ENV XDG_CONFIG_HOME c:/config -ENV XDG_DATA_HOME c:/data - -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 -LABEL org.opencontainers.image.documentation=https://caddyserver.com/docs -LABEL org.opencontainers.image.vendor="Light Code Labs" -LABEL org.opencontainers.image.licenses=Apache-2.0 -LABEL org.opencontainers.image.source="https://github.com/caddyserver/caddy-docker" - -EXPOSE 80 -EXPOSE 443 -EXPOSE 443/udp -EXPOSE 2019 - -# Make sure it runs and reports its version -RUN ["caddy", "version"] - -CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"] diff --git a/2.7/windows/1809/Dockerfile.base b/2.7/windows/1809/Dockerfile.base deleted file mode 100644 index 23c99ad..0000000 --- a/2.7/windows/1809/Dockerfile.base +++ /dev/null @@ -1 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:1809 diff --git a/2.7/windows/ltsc2022/Dockerfile b/2.7/windows/ltsc2022/Dockerfile deleted file mode 100644 index 310ac04..0000000 --- a/2.7/windows/ltsc2022/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -RUN mkdir /config; \ - mkdir /data; \ - mkdir /etc/caddy; \ - mkdir /usr/share/caddy; \ - Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/config/Caddyfile" \ - -OutFile "/etc/caddy/Caddyfile"; \ - Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/dist/raw/509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4/welcome/index.html" \ - -OutFile "/usr/share/caddy/index.html" - -# https://github.com/caddyserver/caddy/releases -ENV CADDY_VERSION v2.7.6 - -RUN Invoke-WebRequest \ - -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('b2321473be1da500a8f6e4276aed03b11946e3758b792a3e9ba50c07246456d64d7da931d6d58be43e6d3cfd07c1ad68f6838df8e090bd5d212224a9bf94daec')) { exit 1; }; \ - Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \ - Remove-Item "/caddy.zip" -Force - -# See https://caddyserver.com/docs/conventions#file-locations for details -ENV XDG_CONFIG_HOME c:/config -ENV XDG_DATA_HOME c:/data - -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 -LABEL org.opencontainers.image.documentation=https://caddyserver.com/docs -LABEL org.opencontainers.image.vendor="Light Code Labs" -LABEL org.opencontainers.image.licenses=Apache-2.0 -LABEL org.opencontainers.image.source="https://github.com/caddyserver/caddy-docker" - -EXPOSE 80 -EXPOSE 443 -EXPOSE 443/udp -EXPOSE 2019 - -# Make sure it runs and reports its version -RUN ["caddy", "version"] - -CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"] diff --git a/2.7/windows/ltsc2022/Dockerfile.base b/2.7/windows/ltsc2022/Dockerfile.base deleted file mode 100644 index f6dcbd4..0000000 --- a/2.7/windows/ltsc2022/Dockerfile.base +++ /dev/null @@ -1 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:ltsc2022 diff --git a/2.8/alpine/Dockerfile b/2.8/alpine/Dockerfile index 4d44d4c..07ba64a 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-rc.1 +ENV CADDY_VERSION v2.8.0 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - x86_64) binArch='amd64'; checksum='7d5d17be995506566d1441bf5e35dc546992616be32d82eeddc88d8f28e1f76321da5775063e64293ba367b83d7698f4698f68c940e8bd3c4fbe9978a9eeee70' ;; \ - armhf) binArch='armv6'; checksum='ca4bc32c88c0019ee7b8fa593e19c4f33ff245db1364dcda38e71a14c17167119f26f18f65aa2afc064aa2f80c2e1dfe9feb4da08ecd6b212290a59d40bf4760' ;; \ - armv7) binArch='armv7'; checksum='c3efc0fe4875dbf91b31657022c20c5fd4fae888edddbdcda85e69289ab795f47287a01d0680d4b13085b23ea0eca8511745922f1323c5875555e13d7bf4417a' ;; \ - aarch64) binArch='arm64'; checksum='b682faa859efb7959d44e721bde3684d4ed5701f9880afd40b40feda3f525e6ebaf5c5900e9c33f8ffc202d6e79ff30735333678cd62cb5a6d27e894ec25d108' ;; \ - ppc64el|ppc64le) binArch='ppc64le'; checksum='6680923022e1c4d081733fc39e5193072d7093c2b1726663c12f2f323b5bd4cc94b2af844a69228c9228019f88faa7c52aa29dfc758346b7e0020e267dac6db6' ;; \ - s390x) binArch='s390x'; checksum='9b7ffd94ef5fef8f5892097d5ca82dcb9757ce28ffa2407ce310e9a72d8ecb746ca08da5f9a5d4fba5a11b3d81eeaab4f9cd199fc503ec78ae6c9fa4adb1b8cd' ;; \ + 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' ;; \ *) 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-rc.1/caddy_2.8.0-rc.1_linux_${binArch}.tar.gz"; \ + wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.8.0/caddy_2.8.0_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-rc.1 +LABEL org.opencontainers.image.version=v2.8.0 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 99f4042..9112c8a 100644 --- a/2.8/builder/Dockerfile +++ b/2.8/builder/Dockerfile @@ -1,13 +1,13 @@ -FROM golang:1.22-alpine3.19 +FROM golang:1.22-alpine3.20 RUN apk add --no-cache \ ca-certificates \ git \ libcap -ENV XCADDY_VERSION v0.4.1 +ENV XCADDY_VERSION v0.4.2 # Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.8.0-rc.1 +ENV CADDY_VERSION v2.8.0 # 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 @@ -16,15 +16,15 @@ ENV XCADDY_SETCAP 1 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - x86_64) binArch='amd64'; checksum='d4866142b2c816dce25685b68af6aa4b65aab01090eb58ffbe963b854f83d3d9ea8c46381d888d5435b8ff971c65878236c23aa9891586a2a69b495fc910b342' ;; \ - armhf) binArch='armv6'; checksum='f3aa9db51a9130ba78da70ef026986ca51df3365449e5b0df6fa8c7bc3f88ad03b6a4072e61a0065fffe115511645c3b31f1deff0aa7590e2f7bab853bda9b3b' ;; \ - armv7) binArch='armv7'; checksum='1c007bd092b2422432e2db7d5c3ecc422c54af669e57bc16df316baadd9857ad4be960852ffd08af9b5530ff31218c458bde3961554fb1218f8519349b6949e7' ;; \ - aarch64) binArch='arm64'; checksum='8d2462a174f2caf092b0d3ced612d0cd352a0afba736b0b81ca100c5ffbdb09b6d1978f49db7b1953e559eae42956912f20f59995112813b120217a624a21893' ;; \ - ppc64el|ppc64le) binArch='ppc64le'; checksum='e99b53e5dd805dc4e06ada2af7fc417a3073e24cba25d400395aa28f385be80db4f4b95ce8548be91c7d668f3a331dcf2293d295f903bf0703e1ca8a95ba47cb' ;; \ - s390x) binArch='s390x'; checksum='edadaa2aa6ff491517697ab887fbe3909026d7085dff772d754fb93d02a5008b344aeed995088bb79afb8b1cc01ed1c96af7b832c0b6888f1c5bedd3d567c4f6' ;; \ + x86_64) binArch='amd64'; checksum='a726e4b7992f3c6c11c585b6100f796f035c6757d247110c6af9bb4f218b7ec67d07db0013c6834e9b881582d75ba4fe8e78f6ca5883b1017da6b5407d1ca25c' ;; \ + armhf) binArch='armv6'; checksum='c0a94f2e59547fe5d4793ec2447ba0b832731c7b1387ae3c90e43f081da57ad68ab506de43ad91a35754a779b591dc5a39a92b6cf3b5ef352622cfb811e92157' ;; \ + armv7) binArch='armv7'; checksum='4820d03ed4a805cf52803725fd1eda9d96f15692ab3cd2803fe91e676f1a24a48b31c4e6a1ec043e5f7f077f302e003e4997ca620c9674ed65e7804417a91af6' ;; \ + aarch64) binArch='arm64'; checksum='41033dc721e799583eac2014b6e409d65a704d0a4360c131662aa651e7fbd129dce03c460661a51e0ba192d27fb3af19faa054da8c037c642b24a12124f6d4a8' ;; \ + ppc64el|ppc64le) binArch='ppc64le'; checksum='ea454e90519f46eeaf785a5789d455a01378dc543838d0b57448509036f3a215913c8a6e1fcb0b9249e9b941f29a29257367609e1ef7ce7f2e0522c768eaf2cf' ;; \ + s390x) binArch='s390x'; checksum='d8d3bf402107dad8f07ed9d5df008b3f6cfd021c93d00f6fc31c641d69649255f2e95d65a46553fb06bf9738158d0ba92d3bbd548e878f4569523b6e6fdeacb5' ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\ esac; \ - wget -O /tmp/xcaddy.tar.gz "https://github.com/caddyserver/xcaddy/releases/download/v0.4.1/xcaddy_0.4.1_linux_${binArch}.tar.gz"; \ + wget -O /tmp/xcaddy.tar.gz "https://github.com/caddyserver/xcaddy/releases/download/v0.4.2/xcaddy_0.4.2_linux_${binArch}.tar.gz"; \ echo "$checksum /tmp/xcaddy.tar.gz" | sha512sum -c; \ tar x -z -f /tmp/xcaddy.tar.gz -C /usr/bin xcaddy; \ rm -f /tmp/xcaddy.tar.gz; \ diff --git a/2.8/builder/Dockerfile.base b/2.8/builder/Dockerfile.base index e36072a..9a3c601 100644 --- a/2.8/builder/Dockerfile.base +++ b/2.8/builder/Dockerfile.base @@ -1 +1 @@ -FROM golang:1.22-alpine3.19 +FROM golang:1.22-alpine3.20 diff --git a/2.8/windows-builder/1809/Dockerfile b/2.8/windows-builder/1809/Dockerfile index dac3605..691a2e8 100644 --- a/2.8/windows-builder/1809/Dockerfile +++ b/2.8/windows-builder/1809/Dockerfile @@ -2,16 +2,16 @@ FROM golang:1.22-windowsservercore-1809 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV XCADDY_VERSION v0.4.1 +ENV XCADDY_VERSION v0.4.2 # Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.8.0-rc.1 +ENV CADDY_VERSION v2.8.0 # Configures xcaddy to not clean up post-build (unnecessary in a container) ENV XCADDY_SKIP_CLEANUP 1 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.1/xcaddy_0.4.1_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.2/xcaddy_0.4.2_windows_amd64.zip" \ -OutFile "/xcaddy.zip"; \ - if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('b058280b1e15e0915c541bc8a3aefc2289155c38a9fbc2f8d6b05267f9d0469eae5be2a9312d52c5ba41c7dbcb18c0970efa5b1df628655cca81b55d5c51d9e1')) { exit 1; }; \ + if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('8ef75d6141029a1f2a2b5aefdee44f0704366302c7416e2136341a3c5910d7809e713cf3d965512f1440473b99c177a0d19789e20601628462747a2d6bc71d27')) { exit 1; }; \ Expand-Archive -Path "/xcaddy.zip" -DestinationPath "/" -Force; \ Remove-Item "/xcaddy.zip" -Force diff --git a/2.8/windows-builder/ltsc2022/Dockerfile b/2.8/windows-builder/ltsc2022/Dockerfile index b0a6acc..61224f2 100644 --- a/2.8/windows-builder/ltsc2022/Dockerfile +++ b/2.8/windows-builder/ltsc2022/Dockerfile @@ -2,16 +2,16 @@ FROM golang:1.22-windowsservercore-ltsc2022 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV XCADDY_VERSION v0.4.1 +ENV XCADDY_VERSION v0.4.2 # Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.8.0-rc.1 +ENV CADDY_VERSION v2.8.0 # Configures xcaddy to not clean up post-build (unnecessary in a container) ENV XCADDY_SKIP_CLEANUP 1 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.1/xcaddy_0.4.1_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.2/xcaddy_0.4.2_windows_amd64.zip" \ -OutFile "/xcaddy.zip"; \ - if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('b058280b1e15e0915c541bc8a3aefc2289155c38a9fbc2f8d6b05267f9d0469eae5be2a9312d52c5ba41c7dbcb18c0970efa5b1df628655cca81b55d5c51d9e1')) { exit 1; }; \ + if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('8ef75d6141029a1f2a2b5aefdee44f0704366302c7416e2136341a3c5910d7809e713cf3d965512f1440473b99c177a0d19789e20601628462747a2d6bc71d27')) { exit 1; }; \ Expand-Archive -Path "/xcaddy.zip" -DestinationPath "/" -Force; \ Remove-Item "/xcaddy.zip" -Force diff --git a/2.8/windows/1809/Dockerfile b/2.8/windows/1809/Dockerfile index a69eb3b..e0d9b5d 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-rc.1 +ENV CADDY_VERSION v2.8.0 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.0-rc.1/caddy_2.8.0-rc.1_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.0/caddy_2.8.0_windows_amd64.zip" \ -OutFile "/caddy.zip"; \ - if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('8be1502ab1872108833d1c8e3ce342df72b6f81acd3539e11b5333181419744a8342d52af2bd1b8033fde9105bb6b61a19479f969cae6f0964d12e08520019e6')) { exit 1; }; \ + if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('403789c4e18a53e5f6d0d170de4d8784b84821a4b3c739b9799863019d10ebd5e90af82588d0ea036611f6e0907e2b144b76a33c7dbf23d05d51ab63d990a0d0')) { 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-rc.1 +LABEL org.opencontainers.image.version=v2.8.0 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 2b8ce56..12f90e7 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-rc.1 +ENV CADDY_VERSION v2.8.0 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.0-rc.1/caddy_2.8.0-rc.1_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/caddy/releases/download/v2.8.0/caddy_2.8.0_windows_amd64.zip" \ -OutFile "/caddy.zip"; \ - if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('8be1502ab1872108833d1c8e3ce342df72b6f81acd3539e11b5333181419744a8342d52af2bd1b8033fde9105bb6b61a19479f969cae6f0964d12e08520019e6')) { exit 1; }; \ + if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('403789c4e18a53e5f6d0d170de4d8784b84821a4b3c739b9799863019d10ebd5e90af82588d0ea036611f6e0907e2b144b76a33c7dbf23d05d51ab63d990a0d0')) { 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-rc.1 +LABEL org.opencontainers.image.version=v2.8.0 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 78ca6d8..1615d8f 100644 --- a/stackbrew-config.yaml +++ b/stackbrew-config.yaml @@ -1,14 +1,10 @@ versions: - - caddy_version: '2.8.0-rc.1' - is_major: false - is_latest: false - dist_commit: 509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4 - - caddy_version: '2.7.6' + - caddy_version: '2.8.0' is_major: true is_latest: true dist_commit: 509c30cecd3cbc4012f6b1cc88d8f3f000fb06e4 xcaddy_config: - version: '0.4.1' + version: '0.4.2' # configuration for the stackbrew.tmpl template variants: - dir: alpine