diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile index 97fb644..874a53e 100644 --- a/2.7/alpine/Dockerfile +++ b/2.7/alpine/Dockerfile @@ -16,20 +16,20 @@ RUN set -eux; \ wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/0c7fa00a87c65a6ef47ed36d841cd223682a2a2c/welcome/index.html" # https://github.com/caddyserver/caddy/releases -ENV CADDY_VERSION v2.7.3 +ENV CADDY_VERSION v2.7.4 RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ - x86_64) binArch='amd64'; checksum='ae7a367be45f5cdaa9e5fd082e225dd84f291a6fb1fe2fefa05b9958461e0967d02de23c9147c8e8ebdc4c91b352e887c1c95b06a64fde6be69a5a32fc459d5e' ;; \ - armhf) binArch='armv6'; checksum='d6744a5e835b08208f5bfcd17525ace7b77420bca575126831f0c27100bc2b5f1ce5dcc08585e90bc8e45261d1bacd2ee37d0b1ac7bd57525e953f2a383f2820' ;; \ - armv7) binArch='armv7'; checksum='eed7a8e99dd0802b195986e077a0607536680fc22d735bde2a2773becdd2ab1063754940264dc0f1c1ca81d8d8647e0924a16aead067f1c73c5c372de9320e5c' ;; \ - aarch64) binArch='arm64'; checksum='258429b3e7fe821c132f4d455a69c2d230a3f90d18bfebdbf7e9676099e7c6dc1a12af7e0b526b8f6b044cb10fe2aab12e449e529e5ed316b7e5b8433e1b353a' ;; \ - ppc64el|ppc64le) binArch='ppc64le'; checksum='af49e94af887ef9090ff664877fdb462f33a129f6565504d7cc4b6e3c2995dd4b1b831338809b2450edfea292defa05711beb7cae35331995117258650e17de1' ;; \ - s390x) binArch='s390x'; checksum='81a2bd1e27bf1793c1979009973b468bfc4d05486888ad0376f0e425ef28812e3149f1f7f60dc924d914af6e8ee7ac90c7e1a9c8dd20c2c370f7063c3fa5049a' ;; \ + x86_64) binArch='amd64'; checksum='68cc53c79b88da5f1a33f5a1e1da7fbac5ad041380e91e27663b44e0cb2d8e07e08690295e86e9e65a37472b52f7d95f84f383ee0b8f3d5e1bd4b755d3990e6a' ;; \ + armhf) binArch='armv6'; checksum='e6db35a9a2d78a8375d287bb1e4dc37f21eeadd5e41ad0c4adc2e35d3f80e061602d3e9c498ac4a4956754ad7be8c5f0489395db2c9729782906d771e528c898' ;; \ + armv7) binArch='armv7'; checksum='5e94a538e9f9d62da2cdfae04294e943800ced348a66fad13ab6c99aa8184485a1ceba2dbcf13d996f4a4bad1a49e2774b880182b0edcf1a112b1001c552e424' ;; \ + aarch64) binArch='arm64'; checksum='eb9be2b3d09351d97843a4e2b73f36a4d36d3cb689dd580b5706b243fb66d0dc8a04460fd4a87dea772442c9fe7a1cddb0022e085be663f3d1e12127e3295d9d' ;; \ + ppc64el|ppc64le) binArch='ppc64le'; checksum='3accb7bbfe23d33057bf023951b3ccddd4cf1708314adad71aa2f298581da293af1bc817ff346248c895499908de7ced661f64a4d115b41657630e14cc8f62a7' ;; \ + s390x) binArch='s390x'; checksum='73c4961582ddc4a0d013c7af85642cf68a7bb0069e04aabba28ff3270f86853b394277d90b7b971695b949087e8d3fb50661da03953e632705e3f63c6e7acdb8' ;; \ *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\ esac; \ - wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.7.3/caddy_2.7.3_linux_${binArch}.tar.gz"; \ + wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.7.4/caddy_2.7.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.7.3 +LABEL org.opencontainers.image.version=v2.7.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.7/builder/Dockerfile b/2.7/builder/Dockerfile index 7ffdba9..a841ba5 100644 --- a/2.7/builder/Dockerfile +++ b/2.7/builder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-alpine3.18 +FROM golang:1.21-alpine3.18 RUN apk add --no-cache \ ca-certificates \ @@ -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.3 +ENV CADDY_VERSION v2.7.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.7/builder/Dockerfile.base b/2.7/builder/Dockerfile.base index 5b2966b..cef39d9 100644 --- a/2.7/builder/Dockerfile.base +++ b/2.7/builder/Dockerfile.base @@ -1 +1 @@ -FROM golang:1.20-alpine3.18 +FROM golang:1.21-alpine3.18 diff --git a/2.7/windows-builder/1809/Dockerfile b/2.7/windows-builder/1809/Dockerfile index 17f5feb..ae607ec 100644 --- a/2.7/windows-builder/1809/Dockerfile +++ b/2.7/windows-builder/1809/Dockerfile @@ -1,10 +1,10 @@ -FROM golang:1.20-windowsservercore-1809 +FROM golang:1.21-windowsservercore-1809 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV XCADDY_VERSION v0.3.5 # Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.7.3 +ENV CADDY_VERSION v2.7.4 # Configures xcaddy to not clean up post-build (unnecessary in a container) ENV XCADDY_SKIP_CLEANUP 1 diff --git a/2.7/windows-builder/1809/Dockerfile.base b/2.7/windows-builder/1809/Dockerfile.base index bd2c554..56c35b7 100644 --- a/2.7/windows-builder/1809/Dockerfile.base +++ b/2.7/windows-builder/1809/Dockerfile.base @@ -1 +1 @@ -FROM golang:1.20-windowsservercore-1809 +FROM golang:1.21-windowsservercore-1809 diff --git a/2.7/windows-builder/ltsc2022/Dockerfile b/2.7/windows-builder/ltsc2022/Dockerfile index 15300cf..c8d89ec 100644 --- a/2.7/windows-builder/ltsc2022/Dockerfile +++ b/2.7/windows-builder/ltsc2022/Dockerfile @@ -1,10 +1,10 @@ -FROM golang:1.20-windowsservercore-ltsc2022 +FROM golang:1.21-windowsservercore-ltsc2022 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] ENV XCADDY_VERSION v0.3.5 # Configures xcaddy to build with this version of Caddy -ENV CADDY_VERSION v2.7.3 +ENV CADDY_VERSION v2.7.4 # Configures xcaddy to not clean up post-build (unnecessary in a container) ENV XCADDY_SKIP_CLEANUP 1 diff --git a/2.7/windows-builder/ltsc2022/Dockerfile.base b/2.7/windows-builder/ltsc2022/Dockerfile.base index 30a1e73..e5ff4ad 100644 --- a/2.7/windows-builder/ltsc2022/Dockerfile.base +++ b/2.7/windows-builder/ltsc2022/Dockerfile.base @@ -1 +1 @@ -FROM golang:1.20-windowsservercore-ltsc2022 +FROM golang:1.21-windowsservercore-ltsc2022 diff --git a/2.7/windows/1809/Dockerfile b/2.7/windows/1809/Dockerfile index 3a6f00c..bb95d35 100644 --- a/2.7/windows/1809/Dockerfile +++ b/2.7/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.7.3 +ENV CADDY_VERSION v2.7.4 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.3/caddy_2.7.3_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.4/caddy_2.7.4_windows_amd64.zip" \ -OutFile "/caddy.zip"; \ - if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('554be2303ba3455085719a19c453290f1654e9ca8bb1cff3556153a6c6eb6ddd04c430f853d98dd1eee5187d4e341bda52baaa9e8e6617e75a447801af1f2fa0')) { exit 1; }; \ + if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('d3bb648c05fed64e6a4815275b92c179d4b6dac4ff34f383cd59e94cde8842aee9c9c14e1334d7f3a0ccf9ac43c96252e4c9e4b6fcca32f7950285379137ab06')) { 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.3 +LABEL org.opencontainers.image.version=v2.7.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.7/windows/ltsc2022/Dockerfile b/2.7/windows/ltsc2022/Dockerfile index 6706309..2709a28 100644 --- a/2.7/windows/ltsc2022/Dockerfile +++ b/2.7/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.7.3 +ENV CADDY_VERSION v2.7.4 RUN Invoke-WebRequest \ - -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.3/caddy_2.7.3_windows_amd64.zip" \ + -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.4/caddy_2.7.4_windows_amd64.zip" \ -OutFile "/caddy.zip"; \ - if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('554be2303ba3455085719a19c453290f1654e9ca8bb1cff3556153a6c6eb6ddd04c430f853d98dd1eee5187d4e341bda52baaa9e8e6617e75a447801af1f2fa0')) { exit 1; }; \ + if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('d3bb648c05fed64e6a4815275b92c179d4b6dac4ff34f383cd59e94cde8842aee9c9c14e1334d7f3a0ccf9ac43c96252e4c9e4b6fcca32f7950285379137ab06')) { 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.3 +LABEL org.opencontainers.image.version=v2.7.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 db13fce..3f03b7f 100644 --- a/stackbrew-config.yaml +++ b/stackbrew-config.yaml @@ -1,16 +1,16 @@ versions: - - caddy_version: '2.7.3' + - caddy_version: '2.7.4' is_major: true is_latest: true dist_commit: 0c7fa00a87c65a6ef47ed36d841cd223682a2a2c checksums: - amd64: ae7a367be45f5cdaa9e5fd082e225dd84f291a6fb1fe2fefa05b9958461e0967d02de23c9147c8e8ebdc4c91b352e887c1c95b06a64fde6be69a5a32fc459d5e - arm32v6: d6744a5e835b08208f5bfcd17525ace7b77420bca575126831f0c27100bc2b5f1ce5dcc08585e90bc8e45261d1bacd2ee37d0b1ac7bd57525e953f2a383f2820 - arm32v7: eed7a8e99dd0802b195986e077a0607536680fc22d735bde2a2773becdd2ab1063754940264dc0f1c1ca81d8d8647e0924a16aead067f1c73c5c372de9320e5c - arm64v8: 258429b3e7fe821c132f4d455a69c2d230a3f90d18bfebdbf7e9676099e7c6dc1a12af7e0b526b8f6b044cb10fe2aab12e449e529e5ed316b7e5b8433e1b353a - ppc64le: af49e94af887ef9090ff664877fdb462f33a129f6565504d7cc4b6e3c2995dd4b1b831338809b2450edfea292defa05711beb7cae35331995117258650e17de1 - s390x: 81a2bd1e27bf1793c1979009973b468bfc4d05486888ad0376f0e425ef28812e3149f1f7f60dc924d914af6e8ee7ac90c7e1a9c8dd20c2c370f7063c3fa5049a - windows_amd64: 554be2303ba3455085719a19c453290f1654e9ca8bb1cff3556153a6c6eb6ddd04c430f853d98dd1eee5187d4e341bda52baaa9e8e6617e75a447801af1f2fa0 + amd64: 68cc53c79b88da5f1a33f5a1e1da7fbac5ad041380e91e27663b44e0cb2d8e07e08690295e86e9e65a37472b52f7d95f84f383ee0b8f3d5e1bd4b755d3990e6a + arm32v6: e6db35a9a2d78a8375d287bb1e4dc37f21eeadd5e41ad0c4adc2e35d3f80e061602d3e9c498ac4a4956754ad7be8c5f0489395db2c9729782906d771e528c898 + arm32v7: 5e94a538e9f9d62da2cdfae04294e943800ced348a66fad13ab6c99aa8184485a1ceba2dbcf13d996f4a4bad1a49e2774b880182b0edcf1a112b1001c552e424 + arm64v8: eb9be2b3d09351d97843a4e2b73f36a4d36d3cb689dd580b5706b243fb66d0dc8a04460fd4a87dea772442c9fe7a1cddb0022e085be663f3d1e12127e3295d9d + ppc64le: 3accb7bbfe23d33057bf023951b3ccddd4cf1708314adad71aa2f298581da293af1bc817ff346248c895499908de7ced661f64a4d115b41657630e14cc8f62a7 + s390x: 73c4961582ddc4a0d013c7af85642cf68a7bb0069e04aabba28ff3270f86853b394277d90b7b971695b949087e8d3fb50661da03953e632705e3f63c6e7acdb8 + windows_amd64: d3bb648c05fed64e6a4815275b92c179d4b6dac4ff34f383cd59e94cde8842aee9c9c14e1334d7f3a0ccf9ac43c96252e4c9e4b6fcca32f7950285379137ab06 xcaddy_config: version: '0.3.5' checksums: