Skip to content

Commit 5572371

Browse files
francislavoiefrancislavoie
authored
Caddy v2.10.2, Go 1.25, Alpine 3.22 (#415)
1 parent 3d0068d commit 5572371

File tree

11 files changed

+46
-46
lines changed

11 files changed

+46
-46
lines changed

‎2.10/alpine/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.21
1+
FROM alpine:3.22
22

33
RUN apk add --no-cache \
44
ca-certificates \
@@ -16,21 +16,21 @@ RUN set -eux; \
1616
wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/33ae08ff08d168572df2956ed14fbc4949880d94/welcome/index.html"
1717

1818
# https://github.com/caddyserver/caddy/releases
19-
ENV CADDY_VERSION v2.10.0
19+
ENV CADDY_VERSION v2.10.2
2020

2121
RUN set -eux; \
2222
apkArch="$(apk --print-arch)"; \
2323
case "$apkArch" in \
24-
x86_64) binArch='amd64'; checksum='626682d623ca04356ab3c9a93a82386cfde6d8243b11f2d0eea9e97ba630c7ada62373401e96b72c6690c98ae8dd004d61fafe477f5249690d5cb251ebbfd2d9' ;; \
25-
armhf) binArch='armv6'; checksum='c4647ed1b5407bd61d55f357af62d3935f2972bb5b03472a2747c4c19610376174bdb573f10b936cbc81acd8a103a0b961118d360cebe2b60693161f83e7f046' ;; \
26-
armv7) binArch='armv7'; checksum='e6794aef179ec3319c5d692fedbb424532a47d7caf19a67ad2a4317c5f2776baaf47658f9e1f7fd37d6f3447a18285cd1d7cb91d0088f5cd01d73874a43aa9c2' ;; \
27-
aarch64) binArch='arm64'; checksum='6d100bfd609e8cfe6a51afe1b86066ac68f53ac56670c74a7d7537d93c643aa7f0e82b9f3083218eee1d369a427bfcdafcb445c7a730f9fc0ddf546401d95484' ;; \
28-
ppc64el|ppc64le) binArch='ppc64le'; checksum='9559d544b8f919837f66623955fd95b03511d85c56455f43d9cc6d0010c00bb1e81fc3b7b5e5a2f8d1d0f65d9571c80cb8b706ea94e2baaaeffec5ae52f68a34' ;; \
29-
riscv64) binArch='riscv64'; checksum='9633d6f6c2bf1911d5887a5d0ea885413785e0968550875b995eecc3bb5fbd1267edec0add94a0286349273e4df0dc1f1067d5639c2393019e235536c1b7c477' ;; \
30-
s390x) binArch='s390x'; checksum='5b29b377409abb9b8d241b95a11f1dd5d709759760b1514c9fbf616c3975048cf384441527fdc179bb8b08dc6189afe9df33499b46509e5d0e3bd6da8bb293b1' ;; \
24+
x86_64) binArch='amd64'; checksum='747df7ee74de188485157a383633a1a963fd9233b71fbb4a69ddcbcc589ce4e2cc82dacf5dbbe136cb51d17e14c59daeb5d9bc92487610b0f3b93680b2646546' ;; \
25+
armhf) binArch='armv6'; checksum='95b71fd99595018eebf4890782de63018ee86455531380b2a83a1814bb09c2588c0a531c877a26ba8a16a5b78072a1c26f7548bdec0e18abcef423fcc31a2e0e' ;; \
26+
armv7) binArch='armv7'; checksum='215af42cf952726d962c9753a12c04248781221b66df8b7110726fa7905d7a5c2e50056e0b47ab3c709d3dcfb48fde0f11e184a6950de0a2ddf941d3e503d07b' ;; \
27+
aarch64) binArch='arm64'; checksum='6ce061a690312ab38367df3c5d5f89a2e4a263e7300d300d87356211bb81e79b15933e6d6203e03fbf26f15cc0311f264805f336147dbdd24938d84b57a4421c' ;; \
28+
ppc64el|ppc64le) binArch='ppc64le'; checksum='ab286a51e0e8ce79393519b0c7ebe99075f4539b57f6a34fe555ba8060f8fbaee36197a1e8e49d0050ab5d6a783253839bc2675137635f8d252aea27f2ca5a85' ;; \
29+
riscv64) binArch='riscv64'; checksum='e71c8ba2462990e0d8a67c544b694446ad36d045bf40ce641fae6774181677457f6ae8ed0b5c4c927ef8302d91c587074b6001318f377d7054113b5da6dee6df' ;; \
30+
s390x) binArch='s390x'; checksum='b8aaa737b63308fac14cf84d7a658d9a0d74d2fe5f6a2eb57ca3ce7c52a73bea702c95da73ebfd20b3206bfb7b71ac8613aef9797e0f7a2c2a04bf5083092c2b' ;; \
3131
*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
3232
esac; \
33-
wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.10.0/caddy_2.10.0_linux_${binArch}.tar.gz"; \
33+
wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.10.2/caddy_2.10.2_linux_${binArch}.tar.gz"; \
3434
echo "$checksum /tmp/caddy.tar.gz" | sha512sum -c; \
3535
tar x -z -f /tmp/caddy.tar.gz -C /usr/bin caddy; \
3636
rm -f /tmp/caddy.tar.gz; \
@@ -42,7 +42,7 @@ RUN set -eux; \
4242
ENV XDG_CONFIG_HOME /config
4343
ENV XDG_DATA_HOME /data
4444

45-
LABEL org.opencontainers.image.version=v2.10.0
45+
LABEL org.opencontainers.image.version=v2.10.2
4646
LABEL org.opencontainers.image.title=Caddy
4747
LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
4848
LABEL org.opencontainers.image.url=https://caddyserver.com

‎2.10/alpine/Dockerfile.base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM alpine:3.21
1+
FROM alpine:3.22

‎2.10/builder/Dockerfile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM golang:1.24-alpine3.21
1+
FROM golang:1.25-alpine3.22
22

33
RUN apk add --no-cache \
44
ca-certificates \
55
git \
66
libcap
77

8-
ENV XCADDY_VERSION v0.4.4
8+
ENV XCADDY_VERSION v0.4.5
99
# Configures xcaddy to build with this version of Caddy
10-
ENV CADDY_VERSION v2.10.0
10+
ENV CADDY_VERSION v2.10.2
1111
# Configures xcaddy to not clean up post-build (unnecessary in a container)
1212
ENV XCADDY_SKIP_CLEANUP 1
1313
# Sets capabilities for output caddy binary to be able to bind to privileged ports
@@ -16,16 +16,16 @@ ENV XCADDY_SETCAP 1
1616
RUN set -eux; \
1717
apkArch="$(apk --print-arch)"; \
1818
case "$apkArch" in \
19-
x86_64) binArch='amd64'; checksum='09b0bd09c879c2985c562deec675da074f896c9e114717d07f11bdb2714b7e9ecbb26748431732469c245e1517cde6e78ee6b0f6e839de3992d22a3d474188fe' ;; \
20-
armhf) binArch='armv6'; checksum='dd1ee3d27bb9f0c2b6b900e19e779398c972fc7a0affaf19ee64fb01689cdd18e2df1429251607dbdeca1ad57d1851317c9f0c0c4c4ead3aa2b9e68678a62d52' ;; \
21-
armv7) binArch='armv7'; checksum='e13003e727c228e84b1abb72db3f92362dd232087256ea51249002d4d0a17d002760123a33dafb8d47553d54c7d821f3d3dee419347a61f967ea4617abaef46a' ;; \
22-
aarch64) binArch='arm64'; checksum='c04464f944ebad714ded44691d359cf27109f5e088f7ee7ed5b49941c88382b0d31c91b81cb1c11444371abe7c491df06aba7306503a17627a7826ac8992e02a' ;; \
23-
ppc64el|ppc64le) binArch='ppc64le'; checksum='c05c883e3a6162b77454ed4efa1e28278d0624a53bb096dced95e27b61f60fdcc0a40e90524806fa07e2da654c6420995fede7077c2c2319351f8f0bc1855cd9' ;; \
24-
riscv64) binArch='riscv64'; checksum='84d1e61330aed77373ffa91dcfda5e20757372fb6ec204e33916a78d864aeb5e0560b2a8aad3166a91311110cb41fce4684a5731cf0d738780f11ee7838811de' ;; \
25-
s390x) binArch='s390x'; checksum='93ff65601c255e9a2910b8ccfd3bcd4765ea6e5261fab31918e8bef0ffa37bcfaf45e2311fd43f9d9a13751102c3644d107d463fdb64d05c2af02307b96e9772' ;; \
19+
x86_64) binArch='amd64'; checksum='edea47d552fd9ac0a533386a72acaa95733ce734f347c11e5513469b5dc0eec0a62a6e21cfa93a83ab00b2dad72e0ee0b9bdf267a9654235f70d4c934739a15b' ;; \
20+
armhf) binArch='armv6'; checksum='29e4b7c484c0045d192fc8e7721c41988c1b8fc529343499ebb2acf94fba60f6e6c25c0944f7fb778ae25d5f8ccca452fc31d0338d6630d9b5219d5f9210ea44' ;; \
21+
armv7) binArch='armv7'; checksum='7e115fe60be169ffccff6884f1ab8fbe754d117c39618b02aedab9c857f0dcdc3cc6949f76b6a799cd617b509021bb086a4b2c5fb6c74d409d09429ff591a616' ;; \
22+
aarch64) binArch='arm64'; checksum='2933968a6e759a0406dc864000960fe0e605db9f0fe0662ce245897eaa5b529e322d1b14c2b98463a95e13f1dfd85432541b41f459a237daedb8c68a8f6a5bb1' ;; \
23+
ppc64el|ppc64le) binArch='ppc64le'; checksum='10e5f7e7dc885b278ebf4c5a97df4bde85a96fbc529890263f42af0445790a18669f44e318be1ac7639a283499e679ce9dabd8fe248478095d514bc2b72e6cd1' ;; \
24+
riscv64) binArch='riscv64'; checksum='4b108ef51ee3fd567f13cba3d3e2c89f86894e27b2ae5585e9ee20346b17f71a3bdcb968b25cb6d88a9a9671ef73cf82a1c0060e273d9b2e0c0c680369c83280' ;; \
25+
s390x) binArch='s390x'; checksum='f2e18d550dc12cb06bedda46c47404a2fbfdfb12363483daf41f5c52736a8ad22c72d7c32edb08aac7a18a1f1faee19aa787ac72b7515f07daf77329f4efbc3f' ;; \
2626
*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
2727
esac; \
28-
wget -O /tmp/xcaddy.tar.gz "https://github.com/caddyserver/xcaddy/releases/download/v0.4.4/xcaddy_0.4.4_linux_${binArch}.tar.gz"; \
28+
wget -O /tmp/xcaddy.tar.gz "https://github.com/caddyserver/xcaddy/releases/download/v0.4.5/xcaddy_0.4.5_linux_${binArch}.tar.gz"; \
2929
echo "$checksum /tmp/xcaddy.tar.gz" | sha512sum -c; \
3030
tar x -z -f /tmp/xcaddy.tar.gz -C /usr/bin xcaddy; \
3131
rm -f /tmp/xcaddy.tar.gz; \

‎2.10/builder/Dockerfile.base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM golang:1.24-alpine3.21
1+
FROM golang:1.25-alpine3.22

‎2.10/windows-builder/ltsc2022/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
FROM golang:1.23-windowsservercore-ltsc2022
1+
FROM golang:1.25-windowsservercore-ltsc2022
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

5-
ENV XCADDY_VERSION v0.4.4
5+
ENV XCADDY_VERSION v0.4.5
66
# Configures xcaddy to build with this version of Caddy
7-
ENV CADDY_VERSION v2.10.0
7+
ENV CADDY_VERSION v2.10.2
88
# Configures xcaddy to not clean up post-build (unnecessary in a container)
99
ENV XCADDY_SKIP_CLEANUP 1
1010

1111
RUN Invoke-WebRequest \
12-
-Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.4/xcaddy_0.4.4_windows_amd64.zip" \
12+
-Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.5/xcaddy_0.4.5_windows_amd64.zip" \
1313
-OutFile "/xcaddy.zip"; \
14-
if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('cbc63529fd591742d67d68ca21c4cdb70a288cb91b20f2d9c711c34b4674d7beccd3aa774e5a6a4b7ea2c8fa92434911288c872b67fe56b8979eedd19130c041')) { exit 1; }; \
14+
if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('652857d019f3e1772b154b33f2479d8f17f4b10818802363737d35601c4cd51dc9a9ba0b3c64cdada9fe6bdcebb4395d0561b2ca302ae1219b288758c01911c1')) { exit 1; }; \
1515
Expand-Archive -Path "/xcaddy.zip" -DestinationPath "/" -Force; \
1616
Remove-Item "/xcaddy.zip" -Force
1717

‎2.10/windows-builder/ltsc2022/Dockerfile.base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM golang:1.23-windowsservercore-ltsc2022
1+
FROM golang:1.25-windowsservercore-ltsc2022

‎2.10/windows-builder/ltsc2025/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
FROM golang:1.23-windowsservercore-ltsc2025
1+
FROM golang:1.25-windowsservercore-ltsc2025
22

33
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
44

5-
ENV XCADDY_VERSION v0.4.4
5+
ENV XCADDY_VERSION v0.4.5
66
# Configures xcaddy to build with this version of Caddy
7-
ENV CADDY_VERSION v2.10.0
7+
ENV CADDY_VERSION v2.10.2
88
# Configures xcaddy to not clean up post-build (unnecessary in a container)
99
ENV XCADDY_SKIP_CLEANUP 1
1010

1111
RUN Invoke-WebRequest \
12-
-Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.4/xcaddy_0.4.4_windows_amd64.zip" \
12+
-Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.4.5/xcaddy_0.4.5_windows_amd64.zip" \
1313
-OutFile "/xcaddy.zip"; \
14-
if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('cbc63529fd591742d67d68ca21c4cdb70a288cb91b20f2d9c711c34b4674d7beccd3aa774e5a6a4b7ea2c8fa92434911288c872b67fe56b8979eedd19130c041')) { exit 1; }; \
14+
if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('652857d019f3e1772b154b33f2479d8f17f4b10818802363737d35601c4cd51dc9a9ba0b3c64cdada9fe6bdcebb4395d0561b2ca302ae1219b288758c01911c1')) { exit 1; }; \
1515
Expand-Archive -Path "/xcaddy.zip" -DestinationPath "/" -Force; \
1616
Remove-Item "/xcaddy.zip" -Force
1717

‎2.10/windows-builder/ltsc2025/Dockerfile.base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM golang:1.23-windowsservercore-ltsc2025
1+
FROM golang:1.25-windowsservercore-ltsc2025

‎2.10/windows/ltsc2022/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ RUN mkdir /config; \
1414
-OutFile "/usr/share/caddy/index.html"
1515

1616
# https://github.com/caddyserver/caddy/releases
17-
ENV CADDY_VERSION v2.10.0
17+
ENV CADDY_VERSION v2.10.2
1818

1919
RUN Invoke-WebRequest \
20-
-Uri "https://github.com/caddyserver/caddy/releases/download/v2.10.0/caddy_2.10.0_windows_amd64.zip" \
20+
-Uri "https://github.com/caddyserver/caddy/releases/download/v2.10.2/caddy_2.10.2_windows_amd64.zip" \
2121
-OutFile "/caddy.zip"; \
22-
if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('cb97adb2bff5de752e470486ae72d55a6ddcfe4bfa43f09ed849260955df7f61385ac1e2d28fc80458b6910d71fa38d4295bb0689263dcc1743f2050d847c2ad')) { exit 1; }; \
22+
if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('88347875f0cd4b5e26bb39cd1f359613f932d54158d560e03244004d1ba6e61aae0cd625ba7c913bd46df096ef973fef2249396b0bb81143414378cb4447aeb8')) { exit 1; }; \
2323
Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \
2424
Remove-Item "/caddy.zip" -Force
2525

2626
# See https://caddyserver.com/docs/conventions#file-locations for details
2727
ENV XDG_CONFIG_HOME c:/config
2828
ENV XDG_DATA_HOME c:/data
2929

30-
LABEL org.opencontainers.image.version=v2.10.0
30+
LABEL org.opencontainers.image.version=v2.10.2
3131
LABEL org.opencontainers.image.title=Caddy
3232
LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
3333
LABEL org.opencontainers.image.url=https://caddyserver.com

‎2.10/windows/ltsc2025/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ RUN mkdir /config; \
1414
-OutFile "/usr/share/caddy/index.html"
1515

1616
# https://github.com/caddyserver/caddy/releases
17-
ENV CADDY_VERSION v2.10.0
17+
ENV CADDY_VERSION v2.10.2
1818

1919
RUN Invoke-WebRequest \
20-
-Uri "https://github.com/caddyserver/caddy/releases/download/v2.10.0/caddy_2.10.0_windows_amd64.zip" \
20+
-Uri "https://github.com/caddyserver/caddy/releases/download/v2.10.2/caddy_2.10.2_windows_amd64.zip" \
2121
-OutFile "/caddy.zip"; \
22-
if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('cb97adb2bff5de752e470486ae72d55a6ddcfe4bfa43f09ed849260955df7f61385ac1e2d28fc80458b6910d71fa38d4295bb0689263dcc1743f2050d847c2ad')) { exit 1; }; \
22+
if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('88347875f0cd4b5e26bb39cd1f359613f932d54158d560e03244004d1ba6e61aae0cd625ba7c913bd46df096ef973fef2249396b0bb81143414378cb4447aeb8')) { exit 1; }; \
2323
Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \
2424
Remove-Item "/caddy.zip" -Force
2525

2626
# See https://caddyserver.com/docs/conventions#file-locations for details
2727
ENV XDG_CONFIG_HOME c:/config
2828
ENV XDG_DATA_HOME c:/data
2929

30-
LABEL org.opencontainers.image.version=v2.10.0
30+
LABEL org.opencontainers.image.version=v2.10.2
3131
LABEL org.opencontainers.image.title=Caddy
3232
LABEL org.opencontainers.image.description="a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go"
3333
LABEL org.opencontainers.image.url=https://caddyserver.com

0 commit comments

Comments
 (0)