Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

caddy: v2.7.5 release #15525

Merged
merged 1 commit into from
Oct 12, 2023
Merged

caddy: v2.7.5 release #15525

merged 1 commit into from
Oct 12, 2023

Conversation

hairyhenderson
Copy link
Contributor

@hairyhenderson
caddy: v2.7.5 release
b1b257f 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
@github-actions
Copy link

Diff for b1b257f: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 58dd9a9..4208a7c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,47 +1,47 @@
 Maintainers: Dave Henderson (@hairyhenderson)
 
-Tags: 2.7.4-alpine, 2.7-alpine, 2-alpine, alpine
-SharedTags: 2.7.4, 2.7, 2, latest
+Tags: 2.7.5-alpine, 2.7-alpine, 2-alpine, alpine
+SharedTags: 2.7.5, 2.7, 2, latest
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: a91e8f29f604a9ac547afb3a8190d170c1f2c494
+GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
 Directory: 2.7/alpine
 
-Tags: 2.7.4-builder-alpine, 2.7-builder-alpine, 2-builder-alpine, builder-alpine
-SharedTags: 2.7.4-builder, 2.7-builder, 2-builder, builder
+Tags: 2.7.5-builder-alpine, 2.7-builder-alpine, 2-builder-alpine, builder-alpine
+SharedTags: 2.7.5-builder, 2.7-builder, 2-builder, builder
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: a91e8f29f604a9ac547afb3a8190d170c1f2c494
+GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
 Directory: 2.7/builder
 
-Tags: 2.7.4-builder-windowsservercore-1809, 2.7-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
-SharedTags: 2.7.4-builder, 2.7-builder, 2-builder, builder
+Tags: 2.7.5-builder-windowsservercore-1809, 2.7-builder-windowsservercore-1809, 2-builder-windowsservercore-1809, builder-windowsservercore-1809
+SharedTags: 2.7.5-builder, 2.7-builder, 2-builder, builder
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: a91e8f29f604a9ac547afb3a8190d170c1f2c494
+GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
 Directory: 2.7/windows-builder/1809
 Constraints: windowsservercore-1809
 
-Tags: 2.7.4-builder-windowsservercore-ltsc2022, 2.7-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
-SharedTags: 2.7.4-builder, 2.7-builder, 2-builder, builder
+Tags: 2.7.5-builder-windowsservercore-ltsc2022, 2.7-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
+SharedTags: 2.7.5-builder, 2.7-builder, 2-builder, builder
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: a91e8f29f604a9ac547afb3a8190d170c1f2c494
+GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
 Directory: 2.7/windows-builder/ltsc2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 2.7.4-windowsservercore-1809, 2.7-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
-SharedTags: 2.7.4-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.4, 2.7, 2, latest
+Tags: 2.7.5-windowsservercore-1809, 2.7-windowsservercore-1809, 2-windowsservercore-1809, windowsservercore-1809
+SharedTags: 2.7.5-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.5, 2.7, 2, latest
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: a91e8f29f604a9ac547afb3a8190d170c1f2c494
+GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
 Directory: 2.7/windows/1809
 Constraints: windowsservercore-1809
 
-Tags: 2.7.4-windowsservercore-ltsc2022, 2.7-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 2.7.4-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.4, 2.7, 2, latest
+Tags: 2.7.5-windowsservercore-ltsc2022, 2.7-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 2.7.5-windowsservercore, 2.7-windowsservercore, 2-windowsservercore, windowsservercore, 2.7.5, 2.7, 2, latest
 Architectures: windows-amd64
 GitRepo: https://github.com/caddyserver/caddy-docker.git
-GitCommit: a91e8f29f604a9ac547afb3a8190d170c1f2c494
+GitCommit: 0b5f063a37d52d579b6d4e64b2e2409ad89f7c7a
 Directory: 2.7/windows/ltsc2022
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 5f32d4d..75ead61 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -16,15 +16,15 @@ caddy:2.7-builder-windowsservercore-ltsc2022
 caddy:2.7-windowsservercore
 caddy:2.7-windowsservercore-1809
 caddy:2.7-windowsservercore-ltsc2022
-caddy:2.7.4
-caddy:2.7.4-alpine
-caddy:2.7.4-builder
-caddy:2.7.4-builder-alpine
-caddy:2.7.4-builder-windowsservercore-1809
-caddy:2.7.4-builder-windowsservercore-ltsc2022
-caddy:2.7.4-windowsservercore
-caddy:2.7.4-windowsservercore-1809
-caddy:2.7.4-windowsservercore-ltsc2022
+caddy:2.7.5
+caddy:2.7.5-alpine
+caddy:2.7.5-builder
+caddy:2.7.5-builder-alpine
+caddy:2.7.5-builder-windowsservercore-1809
+caddy:2.7.5-builder-windowsservercore-ltsc2022
+caddy:2.7.5-windowsservercore
+caddy:2.7.5-windowsservercore-1809
+caddy:2.7.5-windowsservercore-ltsc2022
 caddy:alpine
 caddy:builder
 caddy:builder-alpine
diff --git a/caddy_alpine/Dockerfile b/caddy_alpine/Dockerfile
index 874a53e..38d455a 100644
--- a/caddy_alpine/Dockerfile
+++ b/caddy_alpine/Dockerfile
@@ -16,20 +16,20 @@ RUN set -eux; \
 	wget -O /usr/share/caddy/index.html "https://github.com/caddyserver/dist/raw/0c7fa00a87c65a6ef47ed36d841cd223682a2a2c/welcome/index.html"
 
 # https://github.com/caddyserver/caddy/releases
-ENV CADDY_VERSION v2.7.4
+ENV CADDY_VERSION v2.7.5
 
 RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		x86_64)  binArch='amd64'; checksum='68cc53c79b88da5f1a33f5a1e1da7fbac5ad041380e91e27663b44e0cb2d8e07e08690295e86e9e65a37472b52f7d95f84f383ee0b8f3d5e1bd4b755d3990e6a' ;; \
-		armhf)   binArch='armv6'; checksum='e6db35a9a2d78a8375d287bb1e4dc37f21eeadd5e41ad0c4adc2e35d3f80e061602d3e9c498ac4a4956754ad7be8c5f0489395db2c9729782906d771e528c898' ;; \
-		armv7)   binArch='armv7'; checksum='5e94a538e9f9d62da2cdfae04294e943800ced348a66fad13ab6c99aa8184485a1ceba2dbcf13d996f4a4bad1a49e2774b880182b0edcf1a112b1001c552e424' ;; \
-		aarch64) binArch='arm64'; checksum='eb9be2b3d09351d97843a4e2b73f36a4d36d3cb689dd580b5706b243fb66d0dc8a04460fd4a87dea772442c9fe7a1cddb0022e085be663f3d1e12127e3295d9d' ;; \
-		ppc64el|ppc64le) binArch='ppc64le'; checksum='3accb7bbfe23d33057bf023951b3ccddd4cf1708314adad71aa2f298581da293af1bc817ff346248c895499908de7ced661f64a4d115b41657630e14cc8f62a7' ;; \
-		s390x)   binArch='s390x'; checksum='73c4961582ddc4a0d013c7af85642cf68a7bb0069e04aabba28ff3270f86853b394277d90b7b971695b949087e8d3fb50661da03953e632705e3f63c6e7acdb8' ;; \
+		x86_64)  binArch='amd64'; checksum='4afdf50ccf3a8f32344dbac46006ca2b5d90c2ef656c53e8617f1c3b81c5f9e44bd3a9e0b62975f73c85451c354d3d9b5292f5247d18a62d95ab19c8b0a5dba7' ;; \
+		armhf)   binArch='armv6'; checksum='5f47b4ff5d290799bba1b9183c6ddfe7fee69c8086375337a7498717ce09fc627845f6cb466840daf539c763979ab60fe229b9ddeaf7f92fad800742d4ad5b3a' ;; \
+		armv7)   binArch='armv7'; checksum='bdd120779427cf288a383ecf9d63fa6b61e2118f189e02263ad45989bae507ce1db84ced60de3b33653e9729166e4ca436785503558955b9934be69138184055' ;; \
+		aarch64) binArch='arm64'; checksum='a857cbe25bcc5402e9c4fa2a6c36338f91b7e23962beedccd32e10b3aa34dda084ae742c79085d6e7581acfe33f7c9cf161224b1e56cdb661ebfb6f7424b8d0a' ;; \
+		ppc64el|ppc64le) binArch='ppc64le'; checksum='72c66d44cfc8f8d248e04f08903866d62a0e11c36b51c49c08c73c833a3f4322a780405543e721dcf375b71dee06e90230c64141efb2a9614f551e2134f120a9' ;; \
+		s390x)   binArch='s390x'; checksum='5fb95fb495da282330f34b7f23fff3e664638397dcde2c33a3c7450e448154425b2514573604be3cac03d30b37444c4866170f232f14a33e50bff0d1e1abf126' ;; \
 		*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;;\
 	esac; \
-	wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.7.4/caddy_2.7.4_linux_${binArch}.tar.gz"; \
+	wget -O /tmp/caddy.tar.gz "https://github.com/caddyserver/caddy/releases/download/v2.7.5/caddy_2.7.5_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.4
+LABEL org.opencontainers.image.version=v2.7.5
 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 a841ba5..eba5de0 100644
--- a/caddy_builder-alpine/Dockerfile
+++ b/caddy_builder-alpine/Dockerfile
@@ -7,7 +7,7 @@ RUN apk add --no-cache \
 
 ENV XCADDY_VERSION v0.3.5
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.7.4
+ENV CADDY_VERSION v2.7.5
 # 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/caddy_builder-windowsservercore-1809/Dockerfile b/caddy_builder-windowsservercore-1809/Dockerfile
index ae607ec..6f36dde 100644
--- a/caddy_builder-windowsservercore-1809/Dockerfile
+++ b/caddy_builder-windowsservercore-1809/Dockerfile
@@ -4,7 +4,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 
 ENV XCADDY_VERSION v0.3.5
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.7.4
+ENV CADDY_VERSION v2.7.5
 # Configures xcaddy to not clean up post-build (unnecessary in a container)
 ENV XCADDY_SKIP_CLEANUP 1
 
diff --git a/caddy_builder-windowsservercore-ltsc2022/Dockerfile b/caddy_builder-windowsservercore-ltsc2022/Dockerfile
index c8d89ec..0b041de 100644
--- a/caddy_builder-windowsservercore-ltsc2022/Dockerfile
+++ b/caddy_builder-windowsservercore-ltsc2022/Dockerfile
@@ -4,7 +4,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 
 ENV XCADDY_VERSION v0.3.5
 # Configures xcaddy to build with this version of Caddy
-ENV CADDY_VERSION v2.7.4
+ENV CADDY_VERSION v2.7.5
 # Configures xcaddy to not clean up post-build (unnecessary in a container)
 ENV XCADDY_SKIP_CLEANUP 1
 
diff --git a/caddy_windowsservercore-1809/Dockerfile b/caddy_windowsservercore-1809/Dockerfile
index bb95d35..dc08894 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.4
+ENV CADDY_VERSION v2.7.5
 
 RUN Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.4/caddy_2.7.4_windows_amd64.zip" \
+        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.5/caddy_2.7.5_windows_amd64.zip" \
         -OutFile "/caddy.zip"; \
-    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('d3bb648c05fed64e6a4815275b92c179d4b6dac4ff34f383cd59e94cde8842aee9c9c14e1334d7f3a0ccf9ac43c96252e4c9e4b6fcca32f7950285379137ab06')) { exit 1; }; \
+    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('3201e91a00d8c49acf6165753df34fccfb9c0eacb610b0dad5e5c465cdaced761b061f0c7fc200ce4e87f4acfbd6421e9b3e0121ba293532f4afdf7c9c9c96a0')) { 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.4
+LABEL org.opencontainers.image.version=v2.7.5
 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 2709a28..bd3423d 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.4
+ENV CADDY_VERSION v2.7.5
 
 RUN Invoke-WebRequest \
-        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.4/caddy_2.7.4_windows_amd64.zip" \
+        -Uri "https://github.com/caddyserver/caddy/releases/download/v2.7.5/caddy_2.7.5_windows_amd64.zip" \
         -OutFile "/caddy.zip"; \
-    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('d3bb648c05fed64e6a4815275b92c179d4b6dac4ff34f383cd59e94cde8842aee9c9c14e1334d7f3a0ccf9ac43c96252e4c9e4b6fcca32f7950285379137ab06')) { exit 1; }; \
+    if (!(Get-FileHash -Path /caddy.zip -Algorithm SHA512).Hash.ToLower().Equals('3201e91a00d8c49acf6165753df34fccfb9c0eacb610b0dad5e5c465cdaced761b061f0c7fc200ce4e87f4acfbd6421e9b3e0121ba293532f4afdf7c9c9c96a0')) { 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.4
+LABEL org.opencontainers.image.version=v2.7.5
 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

Relevant Maintainers:

@francislavoie
Copy link
Contributor

From https://github.com/docker-library/official-images/actions/runs/6489066259/job/17622689391?pr=15525 🤔 what the heck:

# github.com/docker-library/bashbrew/cmd/bashbrew
C:\hostedtoolcache\windows\go\1.18.10\x64\pkg\tool\windows_amd64\link.exe: running gcc failed: exit status 1
C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/12.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: C:\Users\RUNNER~1\AppData\Local\Temp\go-link-2040567454\000008.o: in function `_cgo_preinit_init':
\\_\_\runtime\cgo/gcc_libinit_windows.c:30: undefined reference to `__imp___iob_func'
C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/12.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: C:\Users\RUNNER~1\AppData\Local\Temp\go-link-2040567454\000008.o: in function `x_cgo_sys_thread_create':
\\_\_\runtime\cgo/gcc_libinit_windows.c:60: undefined reference to `__imp___iob_func'
C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/12.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: C:\Users\RUNNER~1\AppData\Local\Temp\go-link-2040567454\000008.o: in function `x_cgo_notify_runtime_init_done':
\\_\_\runtime\cgo/gcc_libinit_windows.c:101: undefined reference to `__imp___iob_func'
C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/12.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: C:\Users\RUNNER~1\AppData\Local\Temp\go-link-2040567454\000009.o: in function `x_cgo_thread_start':
\\_\_\runtime\cgo/gcc_util.c:18: undefined reference to `__imp___iob_func'
C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/12.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: C:\Users\RUNNER~1\AppData\Local\Temp\go-link-2040567454\000010.o: in function `_cgo_sys_thread_start':
\\_\_\runtime\cgo/gcc_windows_amd64.c:31: undefined reference to `__imp___iob_func'
collect2.exe: error: ld returned 1 exit status

@yosifkit
Copy link
Member

yosifkit commented Oct 12, 2023 •
edited
Loading

😞 Don't worry about those go github.com/docker-library/bashbrew/cmd/bashbrew windows failures. I've made a fix, but haven't gotten a release with the changes done yet. (Something changed in the windows-2022 GitHub actions builders and broke cgo for us, docker-library/bashbrew#83)

@yosifkit yosifkit merged commit ed4ede9 into docker-library:master Oct 12, 2023
9 of 11 checks passed
@francislavoie francislavoie mentioned this pull request Oct 12, 2023
Closed
@francislavoie
Copy link
Contributor

@yosifkit just wondering, 3 weeks ago you wrote that the build queue is very full #15404 (comment) due to a debian update. Is that still the case today? It seems like the Caddy release for amd64 has still not been built, and we have users complaining about that (and explaining to them that it's out of our control is hard for some of them to hear). Just want to know if there's anything we can do to push this along or if we just need to continue being patient. Is the build queue stuck on something that might need to be cancelled to let the rest continue, etc?

@hairyhenderson hairyhenderson deleted the caddy-2.7.5 branch October 12, 2023 15:09
@yosifkit
Copy link
Member

Yeah, you happened to hit the Debian rebuild timing again (#15508). I've pushed the queued architecture-specific caddy builds to the front of the queue, so they'll build next.

@francislavoie
Copy link
Contributor

Thank you 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/caddy
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hairyhenderson @francislavoie @yosifkit