caddy: v2.8.0 release #16866
Merged
caddy: v2.8.0 release #16866
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for a3e3747:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6a07082..693f41c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,93 +1,47 @@
Maintainers: Dave Henderson (@hairyhenderson), Francis Lavoie (@francislavoie)
-Tags: 2.7.6-alpine, 2.7-alpine, 2-alpine, alpine
-SharedTags: 2.7.6, 2.7, 2, latest
+Tags: 2.8.0-alpine, 2.8-alpine, 2-alpine, alpine
+SharedTags: 2.8.0, 2.8, 2, latest
Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: bb842e2f2671cff715a207d200b1328cb770c9f2
-Directory: 2.7/alpine
-
-Tags: 2.7.6-builder-alpine, 2.7-builder-alpine, 2-builder-alpine, builder-alpine
-SharedTags: 2.7.6-builder, 2.7-builder, 2-builder, builder
-Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: efcb9dd09f5ed76555fe65cb641225838250486e
-Directory: 2.7/builder
-
-Tags: 2.7.6-builder-windowsservercore-1809, 2.7-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
-SharedTags: 2.7.6-builder, 2.7-builder, 2-builder, builder
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: efcb9dd09f5ed76555fe65cb641225838250486e
-Directory: 2.7/windows-builder/1809
-Constraints: windowsservercore-1809
-
-Tags: 2.7.6-builder-windowsservercore-ltsc2022, 2.7-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
-SharedTags: 2.7.6-builder, 2.7-builder, 2-builder, builder
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: efcb9dd09f5ed76555fe65cb641225838250486e
-Directory: 2.7/windows-builder/ltsc2022
-Constraints: windowsservercore-ltsc2022
-
-Tags: 2.7.6-windowsservercore-1809, 2.7-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
-SharedTags: 2.7.6-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.6, 2.7, 2, latest
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: bb842e2f2671cff715a207d200b1328cb770c9f2
-Directory: 2.7/windows/1809
-Constraints: windowsservercore-1809
-
-Tags: 2.7.6-windowsservercore-ltsc2022, 2.7-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 2.7.6-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.6, 2.7, 2, latest
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: bb842e2f2671cff715a207d200b1328cb770c9f2
-Directory: 2.7/windows/ltsc2022
-Constraints: windowsservercore-ltsc2022
-
-Tags: 2.8.0-rc.1-alpine, 2.8-alpine
-SharedTags: 2.8.0-rc.1, 2.8
-Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: b0a0cdbc0537af7b8ee85b480262414d2179455f
+GitCommit: 8e45629b3f219609ebd9ae2dfb70df0e73765b5f
Directory: 2.8/alpine
-Tags: 2.8.0-rc.1-builder-alpine, 2.8-builder-alpine
-SharedTags: 2.8.0-rc.1-builder, 2.8-builder
+Tags: 2.8.0-builder-alpine, 2.8-builder-alpine, 2-builder-alpine, builder-alpine
+SharedTags: 2.8.0-builder, 2.8-builder, 2-builder, builder
Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: b0a0cdbc0537af7b8ee85b480262414d2179455f
+GitCommit: 8e45629b3f219609ebd9ae2dfb70df0e73765b5f
Directory: 2.8/builder
-Tags: 2.8.0-rc.1-builder-windowsservercore-1809, 2.8-builder-windowsservercore-1809
-SharedTags: 2.8.0-rc.1-builder, 2.8-builder
+Tags: 2.8.0-builder-windowsservercore-1809, 2.8-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
+SharedTags: 2.8.0-builder, 2.8-builder, 2-builder, builder
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: b0a0cdbc0537af7b8ee85b480262414d2179455f
+GitCommit: 8e45629b3f219609ebd9ae2dfb70df0e73765b5f
Directory: 2.8/windows-builder/1809
Constraints: windowsservercore-1809
-Tags: 2.8.0-rc.1-builder-windowsservercore-ltsc2022, 2.8-builder-windowsservercore-ltsc2022
-SharedTags: 2.8.0-rc.1-builder, 2.8-builder
+Tags: 2.8.0-builder-windowsservercore-ltsc2022, 2.8-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
+SharedTags: 2.8.0-builder, 2.8-builder, 2-builder, builder
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: b0a0cdbc0537af7b8ee85b480262414d2179455f
+GitCommit: 8e45629b3f219609ebd9ae2dfb70df0e73765b5f
Directory: 2.8/windows-builder/ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 2.8.0-rc.1-windowsservercore-1809, 2.8-windowsservercore-1809
-SharedTags: 2.8.0-rc.1-windowsservercore, 2.8-windowsservercore, 2.8.0-rc.1, 2.8
+Tags: 2.8.0-windowsservercore-1809, 2.8-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
+SharedTags: 2.8.0-windowsservercore, 2.8-windowsservercore, 2-windowsservercore, windowsservercore, 2.8.0, 2.8, 2, latest
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: b0a0cdbc0537af7b8ee85b480262414d2179455f
+GitCommit: 8e45629b3f219609ebd9ae2dfb70df0e73765b5f
Directory: 2.8/windows/1809
Constraints: windowsservercore-1809
-Tags: 2.8.0-rc.1-windowsservercore-ltsc2022, 2.8-windowsservercore-ltsc2022
-SharedTags: 2.8.0-rc.1-windowsservercore, 2.8-windowsservercore, 2.8.0-rc.1, 2.8
+Tags: 2.8.0-windowsservercore-ltsc2022, 2.8-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 2.8.0-windowsservercore, 2.8-windowsservercore, 2-windowsservercore, windowsservercore, 2.8.0, 2.8, 2, latest
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: b0a0cdbc0537af7b8ee85b480262414d2179455f
+GitCommit: 8e45629b3f219609ebd9ae2dfb70df0e73765b5f
Directory: 2.8/windows/ltsc2022
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 2b7f8e1..218ec14 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -7,24 +7,6 @@ caddy:2-builder-windowsservercore-ltsc2022
caddy:2-windowsservercore
caddy:2-windowsservercore-1809
caddy:2-windowsservercore-ltsc2022
-caddy:2.7
-caddy:2.7-alpine
-caddy:2.7-builder
-caddy:2.7-builder-alpine
-caddy:2.7-builder-windowsservercore-1809
-caddy:2.7-builder-windowsservercore-ltsc2022
-caddy:2.7-windowsservercore
-caddy:2.7-windowsservercore-1809
-caddy:2.7-windowsservercore-ltsc2022
-caddy:2.7.6
-caddy:2.7.6-alpine
-caddy:2.7.6-builder
-caddy:2.7.6-builder-alpine
-caddy:2.7.6-builder-windowsservercore-1809
-caddy:2.7.6-builder-windowsservercore-ltsc2022
-caddy:2.7.6-windowsservercore
-caddy:2.7.6-windowsservercore-1809
-caddy:2.7.6-windowsservercore-ltsc2022
caddy:2.8
caddy:2.8-alpine
caddy:2.8-builder
@@ -34,15 +16,15 @@ caddy:2.8-builder-windowsservercore-ltsc2022
caddy:2.8-windowsservercore
caddy:2.8-windowsservercore-1809
caddy:2.8-windowsservercore-ltsc2022
-caddy:2.8.0-rc.1
-caddy:2.8.0-rc.1-alpine
-caddy:2.8.0-rc.1-builder
-caddy:2.8.0-rc.1-builder-alpine
-caddy:2.8.0-rc.1-builder-windowsservercore-1809
-caddy:2.8.0-rc.1-builder-windowsservercore-ltsc2022
-caddy:2.8.0-rc.1-windowsservercore
-caddy:2.8.0-rc.1-windowsservercore-1809
-caddy:2.8.0-rc.1-windowsservercore-ltsc2022
+caddy:2.8.0
+caddy:2.8.0-alpine
+caddy:2.8.0-builder
+caddy:2.8.0-builder-alpine
+caddy:2.8.0-builder-windowsservercore-1809
+caddy:2.8.0-builder-windowsservercore-ltsc2022
+caddy:2.8.0-windowsservercore
+caddy:2.8.0-windowsservercore-1809
+caddy:2.8.0-windowsservercore-ltsc2022
caddy:alpine
caddy:builder
caddy:builder-alpine
diff --git a/caddy_2.8-alpine/Dockerfile b/caddy_2.8-alpine/Dockerfile
deleted file mode 100644
index ac2a12c..0000000
diff --git a/caddy_2.8-builder-alpine/Dockerfile b/caddy_2.8-builder-alpine/Dockerfile
deleted file mode 100644
index 99f4042..0000000
diff --git a/caddy_2.8-builder-alpine/caddy-builder.sh b/caddy_2.8-builder-alpine/caddy-builder.sh
deleted file mode 100755
index cd4b699..0000000
diff --git a/caddy_2.8-builder-windowsservercore-1809/Dockerfile b/caddy_2.8-builder-windowsservercore-1809/Dockerfile
deleted file mode 100644
index dac3605..0000000
diff --git a/caddy_2.8-builder-windowsservercore-ltsc2022/Dockerfile b/caddy_2.8-builder-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index b0a6acc..0000000
diff --git a/caddy_2.8-windowsservercore-1809/Dockerfile b/caddy_2.8-windowsservercore-1809/Dockerfile
deleted file mode 100644
index a69eb3b..0000000
diff --git a/caddy_2.8-windowsservercore-ltsc2022/Dockerfile b/caddy_2.8-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index 2b8ce56..0000000
diff --git a/caddy_alpine/Dockerfile b/caddy_alpine/Dockerfile
index 8ab9ab6..07ba64a 100644
--- a/caddy_alpine/Dockerfile
+++ b/caddy_alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.20
RUN apk add --no-cache \
ca-certificates \
@@ -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.7.6
+ENV CADDY_VERSION v2.8.0
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' ;; \
+ 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.7.6/caddy_2.7.6_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.7.6
+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/caddy_builder-alpine/Dockerfile b/caddy_builder-alpine/Dockerfile
index d89de83..9112c8a 100644
--- a/caddy_builder-alpine/Dockerfile
+++ b/caddy_builder-alpine/Dockerfile
@@ -1,13 +1,13 @@
-FROM golang:1.21-alpine3.18
+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.7.6
+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/caddy_builder-windowsservercore-1809/Dockerfile b/caddy_builder-windowsservercore-1809/Dockerfile
index 1185dfc..691a2e8 100644
--- a/caddy_builder-windowsservercore-1809/Dockerfile
+++ b/caddy_builder-windowsservercore-1809/Dockerfile
@@ -1,17 +1,17 @@
-FROM golang:1.21-windowsservercore-1809
+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.7.6
+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/caddy_builder-windowsservercore-ltsc2022/Dockerfile b/caddy_builder-windowsservercore-ltsc2022/Dockerfile
index 33d6321..61224f2 100644
--- a/caddy_builder-windowsservercore-ltsc2022/Dockerfile
+++ b/caddy_builder-windowsservercore-ltsc2022/Dockerfile
@@ -1,17 +1,17 @@
-FROM golang:1.21-windowsservercore-ltsc2022
+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.7.6
+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/caddy_windowsservercore-1809/Dockerfile b/caddy_windowsservercore-1809/Dockerfile
index cb99e71..e0d9b5d 100644
--- a/caddy_windowsservercore-1809/Dockerfile
+++ b/caddy_windowsservercore-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.6
+ENV CADDY_VERSION v2.8.0
RUN Invoke-WebRequest \
- -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.6/caddy_2.7.6_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('b2321473be1da500a8f6e4276aed03b11946e3758b792a3e9ba50c07246456d64d7da931d6d58be43e6d3cfd07c1ad68f6838df8e090bd5d212224a9bf94daec')) { 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.7.6
+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/caddy_windowsservercore-ltsc2022/Dockerfile b/caddy_windowsservercore-ltsc2022/Dockerfile
index 310ac04..12f90e7 100644
--- a/caddy_windowsservercore-ltsc2022/Dockerfile
+++ b/caddy_windowsservercore-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.6
+ENV CADDY_VERSION v2.8.0
RUN Invoke-WebRequest \
- -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.6/caddy_2.7.6_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('b2321473be1da500a8f6e4276aed03b11946e3758b792a3e9ba50c07246456d64d7da931d6d58be43e6d3cfd07c1ad68f6838df8e090bd5d212224a9bf94daec')) { 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.7.6
+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.comRelevant Maintainers:
|
|
One question btw, we're not sure which Windows version we should be using. Not sure when it's valid to upgrade the Windows version. I'm not even aware of any users that use it and I've never used these Windows images 🤷♂️ so we'd appreciate some pointers on that, whether it makes sense to bump up the base or not. |
|
Sure! Currently, the only "meaningful" versions to support are really only the two you've got (LTSC2022 and 1809) -- we don't officially support anything beyond that here (yet). It's important to support both if you want users to be able to use the images effectively because they essentially have to match the image OS version to their host OS version (or at least "level of compatibility"). In newer versions of Windows, Microsoft is working to relax this (see https://learn.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/version-compatibility for example), but it's going to take a bit before that work hits Windows Server versions in a meaningful way, and even then there'll always be a transition period. 😄 (1809 is effectively Windows Server 2019) |
tianon
approved these changes
May 29, 2024
|
Okay, thanks, good to know. Dependabot has been annoying us about bumping it up but I wasn't comfortable with doing it without knowing the implications. Glad we didn't then! |
|
Oh interesting -- I guess I'll go check your recent PRs to see for myself, but I'm curious what it's suggesting you bump to 😅 |
|
Oh man, caddyserver/caddy-docker#344 is so hilariously wrong I can't believe it's recommending it with a straight face -- Windows is popular enough that I think they need to rush to implement some special cases for those recommendations! 😬 |
|
We might just have it configured incorrectly, I dunno. But yeah 😬 |
|
https://github.com/caddyserver/caddy-docker/blob/31e47e815d156068674d986aa64fa03998df952a/.github/dependabot.yml looks pretty vanilla to me! Those other two PRs are also probably not what you want (you've chosen to "pin" to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://github.com/caddyserver/caddy/releases/tag/v2.8.0