From 0b27c4531456c30b8bf4fda61178076ac96d0220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Wed, 18 Dec 2024 15:15:55 +0100
Subject: [PATCH] improve

---
 build-static.sh           | 13 +++++++++++--
 static-builder.Dockerfile |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/build-static.sh b/build-static.sh
index e4ae81c8d7..7816fc4dea 100755
--- a/build-static.sh
+++ b/build-static.sh
@@ -93,7 +93,7 @@ else
 		if ! type "composer" >/dev/null; then
 			packages="composer"
 		fi
-		if ! type "go" >/dev/null; then
+		if ! type "go" >/dev/null 2>&1; then
 			packages="${packages} go"
 		fi
 		if [ -n "${RELEASE}" ] && ! type "gh" >/dev/null 2>&1; then
@@ -122,6 +122,10 @@ else
 	${spcCommand} build --debug --enable-zts --build-embed ${extraOpts} "${PHP_EXTENSIONS}" --with-libs="${PHP_EXTENSION_LIBS}"
 fi
 
+if ! type "xcaddy" >/dev/null 2>&1; then
+	go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest
+fi
+
 curlGitHubHeaders=(--header "X-GitHub-Api-Version: 2022-11-28")
 if [ "${GITHUB_TOKEN}" ]; then
 	curlGitHubHeaders+=(--header "Authorization: Bearer ${GITHUB_TOKEN}")
@@ -266,12 +270,17 @@ if [ -z "${XCADDY_ARGS}" ]; then
 	XCADDY_ARGS="--with github.com/dunglas/mercure/caddy --with github.com/dunglas/vulcain/caddy"
 fi
 
+XCADDY_DEBUG=0
+if [ -n "${DEBUG_SYMBOLS}" ]; then
+	XCADDY_DEBUG=1
+fi
+
 go env
 cd caddy/
-go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest
 # shellcheck disable=SC2086
 CGO_ENABLED=1 \
 	XCADDY_GO_BUILD_FLAGS="-buildmode=pie -tags cgo,netgo,osusergo,static_build,nobadger,nomysql,nopgx -ldflags \"-linkmode=external -extldflags '-static-pie ${extraExtldflags}' ${extraLdflags} -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ${FRANKENPHP_VERSION} PHP ${LIBPHP_VERSION} Caddy'\"" \
+	XCADDY_DEBUG="${XCADDY_DEBUG}" \
 	xcaddy build \
 	--output "../dist/${bin}" \
 	${XCADDY_ARGS} \
diff --git a/static-builder.Dockerfile b/static-builder.Dockerfile
index e4f31a95e0..7a6920b316 100644
--- a/static-builder.Dockerfile
+++ b/static-builder.Dockerfile
@@ -89,6 +89,8 @@ RUN ./make.bash
 ENV PATH="/goroot/bin:$PATH"
 RUN go version
 
+RUN go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest
+
 # https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
 ENV COMPOSER_ALLOW_SUPERUSER=1
 COPY --from=composer/composer:2-bin /composer /usr/bin/composer