Caddy v2.8.0 (#351)

caddyserver · May 29, 2024 · 8e45629 · 8e45629
1 parent ac811f1
commit 8e45629
Show file tree

Hide file tree

Showing 24 changed files with 41 additions and 340 deletions.
diff --git 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
@@ -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
diff --git a/2.7/alpine/Dockerfile.base b/2.7/alpine/Dockerfile.base
diff --git a/2.7/builder/Caddyfile b/2.7/builder/Caddyfile
diff --git a/2.7/builder/Dockerfile b/2.7/builder/Dockerfile
diff --git a/2.7/builder/Dockerfile.base b/2.7/builder/Dockerfile.base
diff --git a/2.7/builder/caddy-builder.sh b/2.7/builder/caddy-builder.sh
diff --git a/2.7/windows-builder/1809/Dockerfile b/2.7/windows-builder/1809/Dockerfile
diff --git a/2.7/windows-builder/1809/Dockerfile.base b/2.7/windows-builder/1809/Dockerfile.base
diff --git a/2.7/windows-builder/ltsc2022/Dockerfile b/2.7/windows-builder/ltsc2022/Dockerfile
diff --git a/2.7/windows-builder/ltsc2022/Dockerfile.base b/2.7/windows-builder/ltsc2022/Dockerfile.base
diff --git a/2.7/windows/1809/Dockerfile b/2.7/windows/1809/Dockerfile
diff --git a/2.7/windows/1809/Dockerfile.base b/2.7/windows/1809/Dockerfile.base
diff --git a/2.7/windows/ltsc2022/Dockerfile b/2.7/windows/ltsc2022/Dockerfile
diff --git a/2.7/windows/ltsc2022/Dockerfile.base b/2.7/windows/ltsc2022/Dockerfile.base
diff --git 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