caddy: v2.5.0 release #12305
Merged
caddy: v2.5.0 release #12305
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
Signed-off-by: Dave Henderson <[email protected]>
hairyhenderson
force-pushed
the
caddy-2.5.0
branch
from
5f01ace
to
8999552
Compare
Diff for 8999552:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7c45b08..a0e700d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,77 +1,47 @@
Maintainers: Dave Henderson (@hairyhenderson)
-Tags: 2.4.6-alpine, 2-alpine, alpine
-SharedTags: 2.4.6, 2, latest
+Tags: 2.5.0-alpine, 2-alpine, alpine
+SharedTags: 2.5.0, 2, latest
Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: c2a97d2c1ac79f2d20db8464d717eaa5a19c030c
-Directory: 2.4/alpine
-
-Tags: 2.4.6-builder-alpine, 2-builder-alpine, builder-alpine
-SharedTags: 2.4.6-builder, 2-builder, builder
-Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 86712399e65cb78b0840ab558307cf56c4285c42
-Directory: 2.4/builder
-
-Tags: 2.4.6-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
-SharedTags: 2.4.6-builder, 2-builder, builder
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 86712399e65cb78b0840ab558307cf56c4285c42
-Directory: 2.4/windows-builder/1809
-Constraints: windowsservercore-1809
-
-Tags: 2.4.6-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
-SharedTags: 2.4.6-windowsservercore, 2-windowsservercore, windowsservercore, 2.4.6, 2, latest
-Architectures: windows-amd64
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: c2a97d2c1ac79f2d20db8464d717eaa5a19c030c
-Directory: 2.4/windows/1809
-Constraints: windowsservercore-1809
-
-Tags: 2.5.0-rc.1-alpine
-SharedTags: 2.5.0-rc.1
-Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 6e47e48affa229247ee9ec955182003f3b843be9
+GitCommit: 2b9d64fc3511f61ffee47321d69782235b3300a6
Directory: 2.5/alpine
-Tags: 2.5.0-rc.1-builder-alpine
-SharedTags: 2.5.0-rc.1-builder
+Tags: 2.5.0-builder-alpine, 2-builder-alpine, builder-alpine
+SharedTags: 2.5.0-builder, 2-builder, builder
Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 6e47e48affa229247ee9ec955182003f3b843be9
+GitCommit: 2b9d64fc3511f61ffee47321d69782235b3300a6
Directory: 2.5/builder
-Tags: 2.5.0-rc.1-builder-windowsservercore-1809
-SharedTags: 2.5.0-rc.1-builder
+Tags: 2.5.0-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
+SharedTags: 2.5.0-builder, 2-builder, builder
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 6e47e48affa229247ee9ec955182003f3b843be9
+GitCommit: 2b9d64fc3511f61ffee47321d69782235b3300a6
Directory: 2.5/windows-builder/1809
Constraints: windowsservercore-1809
-Tags: 2.5.0-rc.1-builder-windowsservercore-ltsc2022
-SharedTags: 2.5.0-rc.1-builder
+Tags: 2.5.0-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
+SharedTags: 2.5.0-builder, 2-builder, builder
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 6e47e48affa229247ee9ec955182003f3b843be9
+GitCommit: 2b9d64fc3511f61ffee47321d69782235b3300a6
Directory: 2.5/windows-builder/ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 2.5.0-rc.1-windowsservercore-1809
-SharedTags: 2.5.0-rc.1-windowsservercore, 2.5.0-rc.1
+Tags: 2.5.0-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
+SharedTags: 2.5.0-windowsservercore, 2-windowsservercore, windowsservercore, 2.5.0, 2, latest
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 6e47e48affa229247ee9ec955182003f3b843be9
+GitCommit: 2b9d64fc3511f61ffee47321d69782235b3300a6
Directory: 2.5/windows/1809
Constraints: windowsservercore-1809
-Tags: 2.5.0-rc.1-windowsservercore-ltsc2022
-SharedTags: 2.5.0-rc.1-windowsservercore, 2.5.0-rc.1
+Tags: 2.5.0-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 2.5.0-windowsservercore, 2-windowsservercore, windowsservercore, 2.5.0, 2, latest
Architectures: windows-amd64
GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: 6e47e48affa229247ee9ec955182003f3b843be9
+GitCommit: 2b9d64fc3511f61ffee47321d69782235b3300a6
Directory: 2.5/windows/ltsc2022
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index ef3f02a..f4dfa36 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,28 +3,25 @@ caddy:2-alpine
caddy:2-builder
caddy:2-builder-alpine
caddy:2-builder-windowsservercore-1809
+caddy:2-builder-windowsservercore-ltsc2022
caddy:2-windowsservercore
caddy:2-windowsservercore-1809
-caddy:2.4.6
-caddy:2.4.6-alpine
-caddy:2.4.6-builder
-caddy:2.4.6-builder-alpine
-caddy:2.4.6-builder-windowsservercore-1809
-caddy:2.4.6-windowsservercore
-caddy:2.4.6-windowsservercore-1809
-caddy:2.5.0-rc.1
-caddy:2.5.0-rc.1-alpine
-caddy:2.5.0-rc.1-builder
-caddy:2.5.0-rc.1-builder-alpine
-caddy:2.5.0-rc.1-builder-windowsservercore-1809
-caddy:2.5.0-rc.1-builder-windowsservercore-ltsc2022
-caddy:2.5.0-rc.1-windowsservercore
-caddy:2.5.0-rc.1-windowsservercore-1809
-caddy:2.5.0-rc.1-windowsservercore-ltsc2022
+caddy:2-windowsservercore-ltsc2022
+caddy:2.5.0
+caddy:2.5.0-alpine
+caddy:2.5.0-builder
+caddy:2.5.0-builder-alpine
+caddy:2.5.0-builder-windowsservercore-1809
+caddy:2.5.0-builder-windowsservercore-ltsc2022
+caddy:2.5.0-windowsservercore
+caddy:2.5.0-windowsservercore-1809
+caddy:2.5.0-windowsservercore-ltsc2022
caddy:alpine
caddy:builder
caddy:builder-alpine
caddy:builder-windowsservercore-1809
+caddy:builder-windowsservercore-ltsc2022
caddy:latest
caddy:windowsservercore
caddy:windowsservercore-1809
+caddy:windowsservercore-ltsc2022
diff --git a/caddy_2.5.0-rc.1-alpine/Dockerfile b/caddy_2.5.0-rc.1-alpine/Dockerfile
deleted file mode 100644
index f26e9e8..0000000
diff --git a/caddy_2.5.0-rc.1-builder-alpine/Dockerfile b/caddy_2.5.0-rc.1-builder-alpine/Dockerfile
deleted file mode 100644
index 3371d9a..0000000
diff --git a/caddy_2.5.0-rc.1-builder-alpine/caddy-builder.sh b/caddy_2.5.0-rc.1-builder-alpine/caddy-builder.sh
deleted file mode 100755
index cd4b699..0000000
diff --git a/caddy_2.5.0-rc.1-builder-windowsservercore-1809/Dockerfile b/caddy_2.5.0-rc.1-builder-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 1cc5d1b..0000000
diff --git a/caddy_2.5.0-rc.1-windowsservercore-1809/Dockerfile b/caddy_2.5.0-rc.1-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 0c33cdf..0000000
diff --git a/caddy_alpine/Dockerfile b/caddy_alpine/Dockerfile
index 75301c1..32468e2 100644
--- a/caddy_alpine/Dockerfile
+++ b/caddy_alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.15
RUN apk add --no-cache ca-certificates mailcap
@@ -13,20 +13,20 @@ RUN set -eux; \
wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/2f23e8a67eba98613ba87f2d04768f6b28875386/welcome/index.html"
# https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.4.6
+ENV CADDY_VERSION v2.5.0
RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
- x86_64) binArch='amd64'; checksum='ecdcf8ecf6ba92032b27bc935e3ca18b192b25ff54ecfc26bc685ac71c6fe66a6d387cfd085d786533e20f3df3db86e18709a9556d86f1745e9358cc0984973e' ;; \
- armhf) binArch='armv6'; checksum='7d14b1a14a632fff0d82c6e8621c729319befa36b9be9ed2d0309170818e484b8280df4c78538460697afdec59f9781365cc89ac9183310bf15370d56d37ec28' ;; \
- armv7) binArch='armv7'; checksum='c5bc52232ce5cd8f4d91e03996cce9404568804fe6f0e97e79a2d595cadc21918b45fc9c7bc5b4da50a8e02f865391de39ececdeda30dfc592d8f3a5bda6e289' ;; \
- aarch64) binArch='arm64'; checksum='c521f56e6332bb51fb5b9df9c6b790d3a1dc64731ac71bca8d798681b40d912ca54b70f64438efd7e7c926a7a3f7f4daf674080b5be9bfb6bb648238aaba09db' ;; \
- ppc64el|ppc64le) binArch='ppc64le'; checksum='22b20f463c0b5963165fa26c29d3cd30518b85ab3ed1a2f3104c708abc0690b18bacb0ba3f0468ad58bee41472f01d2f9a37fa67a23b422b0070f76c38f3c667' ;; \
- s390x) binArch='s390x'; checksum='949f31cd4a9117c5ac23f195f5d50968ac3cd0cfa6ac3d7040c662a4a39679642f36cb42d9185f502e9887b147628e2c5dc402a06d01f00552a5ba9dfe774f09' ;; \
+ x86_64) binArch='amd64'; checksum='9acd4fb788ed19bfe0718e67b23f259d8af3715e87670fce63667aebdc615351eac438066d617a8869da1dcf44cb643694dd479212065b2b79a5ccb52d667ae6' ;; \
+ armhf) binArch='armv6'; checksum='af1f44c727849ac65a7d842de5f3f8c12e09d0c05f02a84c298e360ea0d0b285927bf1c5a3df6e9eb5f328b576fee6742a0357bd4a8d4cf329e7d624d630b93c' ;; \
+ armv7) binArch='armv7'; checksum='a5ad120205237d1a2914dba5670c7ffd930fdfd3523bd2779616995bf7a6560de76a4b6e32a1c557cf9217f6cb802299f46ad076c4718d00fdb4b21c8ff55647' ;; \
+ aarch64) binArch='arm64'; checksum='37be9629eae6dadd257c5beaf32102564b77d7b8c8d97aac5a2bc8e93962a55afe25fa315f36a5f132665cb4124e9f33c0f5d8a253c60a994bc44d20a4428381' ;; \
+ ppc64el|ppc64le) binArch='ppc64le'; checksum='53dfd99f56ee682f88a4d631d3e8b34bad91ca51af39298bb07bab9290d66d6a4c2557e5103a1600a875cfa928be44febc88544ae0d42692d6c9a9479ab8479e' ;; \
+ s390x) binArch='s390x'; checksum='b65614c618d3a9e8200389c2434291556283ffc39b834523893c75b2a335e7253bf8a571b310e2a4c60e24141fd32a5e66d0774434f443002753331b42ec3737' ;; \
*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
esac; \
- wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.4.6/caddy_2.4.6_linux_${binArch}.tar.gz"; \
+ wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.5.0/caddy_2.5.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,10 +41,7 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
ENV XDG_CONFIG_HOME /config
ENV XDG_DATA_HOME /data
-VOLUME /config
-VOLUME /data
-
-LABEL org.opencontainers.image.version=v2.4.6
+LABEL org.opencontainers.image.version=v2.5.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 fad3de5..db11620 100644
--- a/caddy_builder-alpine/Dockerfile
+++ b/caddy_builder-alpine/Dockerfile
@@ -1,27 +1,27 @@
-FROM golang:1.17-alpine
+FROM golang:1.18-alpine
RUN apk add --no-cache \
git \
ca-certificates
-ENV XCADDY_VERSION v0.2.1
+ENV XCADDY_VERSION v0.3.0
# Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.4.6
+ENV CADDY_VERSION v2.5.0
# Configures xcaddy to not clean up post-build (unnecessary in a container)
ENV XCADDY_SKIP_CLEANUP 1
RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
- x86_64) binArch='amd64'; checksum='30621f45934c6450dcf6ca790f2763a334ce58048a50e6d2b552a145da6cc0b79e454724d9953483794119c1b90555a8657e6311940cb37dd21c193e22459252' ;; \
- armhf) binArch='armv6'; checksum='5d1265a07be13aa9f2c9d8ad9a75d5658bca1dfc66c2b1b100b517edf4ac7a1fe18494c7b01b3856102e1cfc912912d049393accd8b1ef22f73bfc22bb27daec' ;; \
- armv7) binArch='armv7'; checksum='04e1b4c14def100db4c2da0c08d2bd48f1e965a6250763659a5e435d2815559483f7ce533e36cca9a15709508deab133972b19ff87a76f15ea01876a62e49edf' ;; \
- aarch64) binArch='arm64'; checksum='e4cabca39b61c6a7956b828e9b1e1c39e802b65a1c1e3ce44d93bcffaafce6625884315815051f08209deb53a294101bf9c60ffbf000ac8ce2ba38a13e8e2287' ;; \
- ppc64el|ppc64le) binArch='ppc64le'; checksum='ff1cc638ee18ce3ef36097547db9cdc3ff27f8ce46d8df50273663655ccea909a8396a01b4a144d57ad7e896ec6aef052c31f516c2a9c7e08d04a27228cf1c42' ;; \
- s390x) binArch='s390x'; checksum='335a7436927378508e0d55b74898b8d36f73f7a8ceaaa038c0ac054ab79c96b77acb642fb7881a07358b161e6e54efb8db0eacd0bd10f8f151698de517bffa0b' ;; \
+ x86_64) binArch='amd64'; checksum='889b63098037e4641cce5b355bd82535a4b6bbbc4aa16b8214108d0d847d288b52cd19017a477eedc9c066c2ec623310dd7909251888bc9432a7d7553ba9037e' ;; \
+ armhf) binArch='armv6'; checksum='decfc298b900b62ee16e0dc92a05d3b61926b961de5ee10138ce9fc6cde85dba732928d4481e02e4290750c85a92c4c24c1850045eb16c0d6a75781ff1506964' ;; \
+ armv7) binArch='armv7'; checksum='99819ca7b2d37ab93e0b6af8f41dbc16dec5844c47b64993c1c1c2df0567e4abbff55ca6e9642231bd68a1789d0ebbef36822362f0c29d6dcdb01d55b3669cba' ;; \
+ aarch64) binArch='arm64'; checksum='24203b66ed47ba5aaa358a9e84c6a13f48737d8dc2902fdc7e2218409ac1bde9f043f0bbdf7b66697c9f9263cf1272a73784e51a26eca94ff37bcda4c21ece87' ;; \
+ ppc64el|ppc64le) binArch='ppc64le'; checksum='b96d1e6bfced6288678d45b120988e0c9e386671526688d229ace91b8f40ae03ae98a31aca9bdbbdbb9b865037e606801e434594d49cb1654398f53b4f904fd4' ;; \
+ s390x) binArch='s390x'; checksum='6af5190825ac0ff01a60c7bfe5dbfea999841b9b1cf8dfca337c30eabc4aa7c03ad4da948f3472954a94f53552c1ab0a7bbd76894af6eb218ae118de68481f78' ;; \
*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
esac; \
- wget -O /tmp/xcaddy.tar.gz "https://github.com/caddyserver/xcaddy/releases/download/v0.2.1/xcaddy_0.2.1_linux_${binArch}.tar.gz"; \
+ wget -O /tmp/xcaddy.tar.gz "https://github.com/caddyserver/xcaddy/releases/download/v0.3.0/xcaddy_0.3.0_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 39c6f9a..a0b27db 100644
--- a/caddy_builder-windowsservercore-1809/Dockerfile
+++ b/caddy_builder-windowsservercore-1809/Dockerfile
@@ -2,18 +2,18 @@ FROM golang:1.17-windowsservercore-1809
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-ENV XCADDY_VERSION v0.2.1
+ENV XCADDY_VERSION v0.3.0
# Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.4.6
+ENV CADDY_VERSION v2.5.0
# Configures xcaddy to not clean up post-build (unnecessary in a container)
ENV XCADDY_SKIP_CLEANUP 1
# Apparently Windows Server 2016 disables TLS 1.2 by default - this enables it so we can talk to GitHub
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest \
- -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.2.1/xcaddy_0.2.1_windows_amd64.zip" \
+ -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.3.0/xcaddy_0.3.0_windows_amd64.zip" \
-OutFile "/xcaddy.zip"; \
- if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('fc6f2a7feb8f0936a0e04d3c9ea26d0404c2f4907eb436eb60e33152c22c1211f851c46606573fcb5c3334f8cc4f7f810b28b917a9f313f6454d1c5cd0f50f8a')) { exit 1; }; \
+ if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('63d60531a924a0618a15907a276a67745186a1f92077a48aff2fb68b549b7b80a92238f8a8dca6af82e1840dcdac479e32672b7d62f118c77363be6fae5281a6')) { exit 1; }; \
Expand-Archive -Path "/xcaddy.zip" -DestinationPath "/" -Force; \
Remove-Item "/xcaddy.zip" -Force
diff --git a/caddy_2.5.0-rc.1-builder-windowsservercore-ltsc2022/Dockerfile b/caddy_builder-windowsservercore-ltsc2022/Dockerfile
similarity index 75%
rename from caddy_2.5.0-rc.1-builder-windowsservercore-ltsc2022/Dockerfile
rename to caddy_builder-windowsservercore-ltsc2022/Dockerfile
index 0b2ab62..8134c47 100644
--- a/caddy_2.5.0-rc.1-builder-windowsservercore-ltsc2022/Dockerfile
+++ b/caddy_builder-windowsservercore-ltsc2022/Dockerfile
@@ -2,18 +2,18 @@ FROM golang:1.18-windowsservercore-ltsc2022
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-ENV XCADDY_VERSION v0.2.1
+ENV XCADDY_VERSION v0.3.0
# Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.5.0-rc.1
+ENV CADDY_VERSION v2.5.0
# Configures xcaddy to not clean up post-build (unnecessary in a container)
ENV XCADDY_SKIP_CLEANUP 1
# Apparently Windows Server 2016 disables TLS 1.2 by default - this enables it so we can talk to GitHub
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest \
- -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.2.1/xcaddy_0.2.1_windows_amd64.zip" \
+ -Uri "https://github.com/caddyserver/xcaddy/releases/download/v0.3.0/xcaddy_0.3.0_windows_amd64.zip" \
-OutFile "/xcaddy.zip"; \
- if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('fc6f2a7feb8f0936a0e04d3c9ea26d0404c2f4907eb436eb60e33152c22c1211f851c46606573fcb5c3334f8cc4f7f810b28b917a9f313f6454d1c5cd0f50f8a')) { exit 1; }; \
+ if (!(Get-FileHash -Path /xcaddy.zip -Algorithm SHA512).Hash.ToLower().Equals('63d60531a924a0618a15907a276a67745186a1f92077a48aff2fb68b549b7b80a92238f8a8dca6af82e1840dcdac479e32672b7d62f118c77363be6fae5281a6')) { 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 d10b217..f52e809 100644
--- a/caddy_windowsservercore-1809/Dockerfile
+++ b/caddy_windowsservercore-1809/Dockerfile
@@ -16,13 +16,13 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
-OutFile "/usr/share/caddy/index.html"
# https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.4.6
+ENV CADDY_VERSION v2.5.0
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest \
- -Uri "https://github.com/caddyserver/caddy/releases/download/v2.4.6/caddy_2.4.6_windows_amd64.zip" \
+ -Uri "https://github.com/caddyserver/caddy/releases/download/v2.5.0/caddy_2.5.0_windows_amd64.zip" \
-OutFile "/caddy.zip"; \
- if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('08fe8b50664644f5672a7357a7fe4c4835828c2464965ad78ec5f483dd2cd5643c64ea929d2f131601c48d71d2ddaebe251eb608d435ae1e31abe39d0687aebb')) { exit 1; }; \
+ if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('bdd4080106c861512a0b879349cc1526c4e025cec7b2be756bb8d5a3ee704e4911959cfb81f3af3004fe0862fb0dfadbb8e0a9ea728a3f6586a5527df010bacc')) { exit 1; }; \
Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \
Remove-Item "/caddy.zip" -Force
@@ -30,10 +30,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
ENV XDG_CONFIG_HOME c:/config
ENV XDG_DATA_HOME c:/data
-VOLUME c:/config
-VOLUME c:/data
-
-LABEL org.opencontainers.image.version=v2.4.6
+LABEL org.opencontainers.image.version=v2.5.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_2.5.0-rc.1-windowsservercore-ltsc2022/Dockerfile b/caddy_windowsservercore-ltsc2022/Dockerfile
similarity index 86%
rename from caddy_2.5.0-rc.1-windowsservercore-ltsc2022/Dockerfile
rename to caddy_windowsservercore-ltsc2022/Dockerfile
index 04efe1b..988e76c 100644
--- a/caddy_2.5.0-rc.1-windowsservercore-ltsc2022/Dockerfile
+++ b/caddy_windowsservercore-ltsc2022/Dockerfile
@@ -16,13 +16,13 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
-OutFile "/usr/share/caddy/index.html"
# https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.5.0-rc.1
+ENV CADDY_VERSION v2.5.0
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest \
- -Uri "https://github.com/caddyserver/caddy/releases/download/v2.5.0-rc.1/caddy_2.5.0-rc.1_windows_amd64.zip" \
+ -Uri "https://github.com/caddyserver/caddy/releases/download/v2.5.0/caddy_2.5.0_windows_amd64.zip" \
-OutFile "/caddy.zip"; \
- if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('3d7b6a2e4384e6dc9c176036c03eecb2f28488e45e85a2db2c6f72eb3bbeb33c29a5830b96d803805223624d8d706ef2c9b4c1c33001b81fae5b159222e7f637')) { exit 1; }; \
+ if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('bdd4080106c861512a0b879349cc1526c4e025cec7b2be756bb8d5a3ee704e4911959cfb81f3af3004fe0862fb0dfadbb8e0a9ea728a3f6586a5527df010bacc')) { exit 1; }; \
Expand-Archive -Path "/caddy.zip" -DestinationPath "/" -Force; \
Remove-Item "/caddy.zip" -Force
@@ -30,10 +30,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
ENV XDG_CONFIG_HOME c:/config
ENV XDG_DATA_HOME c:/data
-VOLUME c:/config
-VOLUME c:/data
-
-LABEL org.opencontainers.image.version=v2.5.0-rc.1
+LABEL org.opencontainers.image.version=v2.5.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:
|
|
@hairyhenderson after this upgrade, we started to experience issue as https://caddy.community/t/error-during-parsing-unexpected-eof/15773 |
|
@shanlashari I highly doubt this is an issue with the Docker image. Let's keep this discussion on the forum thread for now. |
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.5.0
In addition to the upgrade, the spurious
VOLUMEinstructions were also removed.This also stops building v2.4.x images.
Signed-off-by: Dave Henderson [email protected]