Merge pull request #306 from caddyserver/caddy-2.7.2

Caddy v2.7.2
caddyserver · Aug 3, 2023 · 0d6ffc4 · 0d6ffc4
2 parents 5b0fc21 + a05143a
commit 0d6ffc4
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 345 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,47 +1,5 @@
 version: 2
 updates:
-- package-ecosystem: docker
-  directory: "/2.6/alpine"
-  schedule:
-    interval: daily
-    time: "02:00"
-    timezone: UTC
-  open-pull-requests-limit: 10
-- package-ecosystem: docker
-  directory: "/2.6/builder"
-  schedule:
-    interval: daily
-    time: "02:00"
-    timezone: UTC
-  open-pull-requests-limit: 10
-- package-ecosystem: docker
-  directory: "/2.6/windows/1809"
-  schedule:
-    interval: daily
-    time: "02:00"
-    timezone: UTC
-  open-pull-requests-limit: 10
-- package-ecosystem: docker
-  directory: "/2.6/windows/ltsc2022"
-  schedule:
-    interval: daily
-    time: "02:00"
-    timezone: UTC
-  open-pull-requests-limit: 10
-- package-ecosystem: docker
-  directory: "/2.6/windows-builder/1809"
-  schedule:
-    interval: daily
-    time: "02:00"
-    timezone: UTC
-  open-pull-requests-limit: 10
-- package-ecosystem: docker
-  directory: "/2.6/windows-builder/ltsc2022"
-  schedule:
-    interval: daily
-    time: "02:00"
-    timezone: UTC
-  open-pull-requests-limit: 10
 - package-ecosystem: docker
   directory: "/2.7/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.6/alpine/Dockerfile 2.6/alpine
-          docker build -f 2.6/builder/Dockerfile 2.6/builder
+          docker build -f 2.7/alpine/Dockerfile 2.7/alpine
+          docker build -f 2.7/builder/Dockerfile 2.7/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.6/windows/1809/Dockerfile 2.6/windows
+          docker build -f 2.7/windows/1809/Dockerfile 2.7/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.6/alpine/Dockerfile b/2.6/alpine/Dockerfile
diff --git a/2.6/alpine/Dockerfile.base b/2.6/alpine/Dockerfile.base
diff --git a/2.6/builder/Caddyfile b/2.6/builder/Caddyfile
diff --git a/2.6/builder/Dockerfile b/2.6/builder/Dockerfile
diff --git a/2.6/builder/Dockerfile.base b/2.6/builder/Dockerfile.base
diff --git a/2.6/builder/caddy-builder.sh b/2.6/builder/caddy-builder.sh
diff --git a/2.6/windows-builder/1809/Dockerfile b/2.6/windows-builder/1809/Dockerfile
diff --git a/2.6/windows-builder/1809/Dockerfile.base b/2.6/windows-builder/1809/Dockerfile.base
diff --git a/2.6/windows-builder/ltsc2022/Dockerfile b/2.6/windows-builder/ltsc2022/Dockerfile
diff --git a/2.6/windows-builder/ltsc2022/Dockerfile.base b/2.6/windows-builder/ltsc2022/Dockerfile.base
diff --git a/2.6/windows/1809/Dockerfile b/2.6/windows/1809/Dockerfile
diff --git a/2.6/windows/1809/Dockerfile.base b/2.6/windows/1809/Dockerfile.base
diff --git a/2.6/windows/ltsc2022/Dockerfile b/2.6/windows/ltsc2022/Dockerfile
diff --git a/2.6/windows/ltsc2022/Dockerfile.base b/2.6/windows/ltsc2022/Dockerfile.base
diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile
@@ -12,24 +12,24 @@ RUN set -eux; \
 		/etc/caddy \
 		/usr/share/caddy \
 	; \
-	wget -O /etc/caddy/Caddyfile "https://github.com/caddyserver/dist/raw/305fe484cc8a9ac72900e8cc172d652102a87240/config/Caddyfile"; \
-	wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/305fe484cc8a9ac72900e8cc172d652102a87240/welcome/index.html"
+	wget -O /etc/caddy/Caddyfile "https://github.com/caddyserver/dist/raw/5910351159c2995a9a1c911d7879de6ff598d905/config/Caddyfile"; \
+	wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/5910351159c2995a9a1c911d7879de6ff598d905/welcome/index.html"
 
 # https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.7.0-beta.2
+ENV CADDY_VERSION v2.7.2
 
 RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		x86_64)  binArch='amd64'; checksum='0f540623859001ecbd651bda4c74cd1f0c587bd60c156b8cdfaef686487e73123b654a423d0c4b3df5c57221cc656acd3afd0c9b11303d6a4bdc1d5086a90f3d' ;; \
-		armhf)   binArch='armv6'; checksum='6dc8ce3bf8ad3237f521f67be396bb23c608cfae5ada33be823c72d26c666edcc6e7aa483ef32cff42d2fdb8c43552e52dece9badbdd64fff6d0c3cd4a313bab' ;; \
-		armv7)   binArch='armv7'; checksum='37e5ce287ee14da54c4835343738b8d0e4a12395bce99a33c5b6df90723444ab7607348652765112cb924d0bc7db1ecad396c095ef98598e89fa60710e5f7512' ;; \
-		aarch64) binArch='arm64'; checksum='cc07d50c582490350dc6249c88921364e4ad4d0508388089018d207da7d5ad5497ae811dc762bde0a7c00a823419037024b8c16de4297f2e255d74d784a2f39b' ;; \
-		ppc64el|ppc64le) binArch='ppc64le'; checksum='5f2cf61309ea67f613c1a92120270fc39e7513e120ebc8818e0e185b32a46b69f9c527bd09e145561c61e73db8f6c3b5c05ba9da9a6a9f1b4bd14765e246c80b' ;; \
-		s390x)   binArch='s390x'; checksum='f4179b75dcc6b302d805291377a8772df8e3dc5ae5733d9aa9884db29a543d87cf4bfb097e59d8d6baf4255fdb96b508d47f6387267eb3273c5c6d60a1f6b906' ;; \
+		x86_64)  binArch='amd64'; checksum='b6690cd345f016b4795195f30e626a54644e66f95dc106fb72b44e009aad87433258cd091dc72d8ae357e1b2081d173da528d3f745fe5eb12286c20aa919a21c' ;; \
+		armhf)   binArch='armv6'; checksum='7911c1a7129550e8f712d6a9c8ec695e2ec8fa025109b360a94275fe50ae9b5039099464e02e30030e5349fa33106600d05623d60aa3bc1d520697c5b07db120' ;; \
+		armv7)   binArch='armv7'; checksum='fa8596887d1ea7652caea888511377c7c6ea4492889ec0ab1bf76c366f9e52247d41844bffc2f961cc4d06607d65982d8443651ef53f348c7d60f4fb98efbdb9' ;; \
+		aarch64) binArch='arm64'; checksum='48db86b764e23b892547741e30bf7c95561e804ec999c42fc1dac237ba8b0797abea76556e45c3b231f7acf303e3511507268c62f88076fd31891fc3a03564a7' ;; \
+		ppc64el|ppc64le) binArch='ppc64le'; checksum='049f0b0529e3e9334388fd099f03fa48a2f5fa2d17b00f46566117397a5468acbc392782abfe815f15f0ef6d8e3f1055bd1d275a927a42590782b83e01259a79' ;; \
+		s390x)   binArch='s390x'; checksum='3dadb51b4b1e03b884ba00a96fa7371b80aaf97f820bde7e15d2be745b02b91fa00b66422088bc94725ab86600206c458dc3a393e74f9192ef7e76d6fa54cb1f' ;; \
 		*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
 	esac; \
-	wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.7.0-beta.2/caddy_2.7.0-beta.2_linux_${binArch}.tar.gz"; \
+	wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.7.2/caddy_2.7.2_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.0-beta.2
+LABEL org.opencontainers.image.version=v2.7.2
 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
@@ -7,7 +7,7 @@ RUN apk add --no-cache \
 
 ENV XCADDY_VERSION v0.3.4
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.7.0-beta.2
+ENV CADDY_VERSION v2.7.2
 # 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/windows-builder/1809/Dockerfile b/2.7/windows-builder/1809/Dockerfile
@@ -4,7 +4,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 
 ENV XCADDY_VERSION v0.3.4
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.7.0-beta.2
+ENV CADDY_VERSION v2.7.2
 # Configures xcaddy to not clean up post-build (unnecessary in a container)
 ENV XCADDY_SKIP_CLEANUP 1