From a95b9fe7e6b8db42d9edaead90fb7b3b2d29c0af Mon Sep 17 00:00:00 2001
From: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>
Date: Sat, 31 Aug 2024 19:13:34 +0800
Subject: [PATCH] build(docker): update xcaddy build plugins and entrypoint
 script

Also enabling DOCKER_BUILDKIT to slience legacy builder warnings

Signed-off-by: Andrei Jiroh Halili <ajhalili2006@andreijiroh.xyz>
---
 docker/caddy/Dockerfile    | 15 +++++++++++----
 docker/caddy/entrypoint.sh | 20 +++++++++++++++-----
 scripts/build              |  2 ++
 3 files changed, 28 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 docker/caddy/entrypoint.sh

diff --git a/docker/caddy/Dockerfile b/docker/caddy/Dockerfile
index 5ed0559..a105ccd 100644
--- a/docker/caddy/Dockerfile
+++ b/docker/caddy/Dockerfile
@@ -1,7 +1,10 @@
 # syntax=docker/dockerfile:1
-FROM tailscale/tailscale:latest as tailscale
+FROM mau.dev/andreijiroh-dev/dependency_proxy/containers/tailscale/tailscale:latest as tailscale
 
-FROM caddy:builder-alpine as builder
+FROM mau.dev/andreijiroh-dev/dependency_proxy/containers/caddy:builder-alpine as builder
+
+ARG CGO_ENABLED=1
+ARG XCADDY_GO_BUILD_FLAGS="-ldflags '-w -s -Wl,-z,stack-size=0x80000'"
 
 RUN xcaddy build \
     --with github.com/caddy-dns/cloudflare \
@@ -9,9 +12,13 @@ RUN xcaddy build \
     --with github.com/caddy-dns/netlify \
     --with github.com/ss098/certmagic-s3 \
     --with github.com/sagikazarmark/caddy-fs-s3 \
-    --with github.com/kadeessh/kadeessh
+    --with github.com/kadeessh/kadeessh \
+    --with github.com/dunglas/frankenphp/caddy \
+    --with github.com/dunglas/caddy-cbrotli \
+    --with github.com/dunglas/mercure/caddy \
+    --with github.com/dunglas/vulcain/caddy
 
-FROM caddy:alpine as deploy
+FROM mau.dev/andreijiroh-dev/dependency_proxy/containers/caddy:alpine as deploy
 
 COPY entrypoint.sh /usr/local/bin/
 RUN apk add --no-cache ca-certificates iptables iproute2 ip6tables \
diff --git a/docker/caddy/entrypoint.sh b/docker/caddy/entrypoint.sh
old mode 100755
new mode 100644
index a3c8f27..7668422
--- a/docker/caddy/entrypoint.sh
+++ b/docker/caddy/entrypoint.sh
@@ -1,8 +1,18 @@
-#!/usr/bin sh
+#!/usr/bin/env bash
+set -xe
+TAILSCALE_AUTHKEY=${TAILSCALE_AUTHKEY:-""}
+TAILSCALE_HOSTNAME=${TAILSCALE_HOSTNAME:-"caddy"}
+TAILSCALE_UP_ADDITIONAL_ARGS=${TAILSCALE_UP_ADDITIONAL_ARGS:-""}
+TAILSCALE_TAGS="tag:caddy,tag:docker"
+CADDYFILE_PATH=${CADDYFILE_PATH:-"/etc/caddy/Caddyfile"}
 
-if [[ $TAILSCALE_AUTHKEY ]]; then
-  tailscaled --tun=userspace-networking --socks5-server=localhost:1055 &
-  tailscale up --authkey=${TAILSCALE_AUTHKEY} --hostname=${TAILSCALE_HOSTNAME:-"caddy"}
+tailscaled --tun=userspace-networking --socks5-server=localhost:1055 &
+if [[ $TAILSCALE_AUTHKEY != "" ]]; then
+    tailscale up \
+        --authkey="${TAILSCALE_AUTHKEY}" \
+        --hostname=${TAILSCALE_HOSTNAME} \
+        --accept-tags=${TAILSCALE_TAGS} \
+        ${TAILSCALE_UP_ADDITIONAL_ARGS}
 fi
 
-caddy run --config ${CADDYFILE_PATH:-"/etc/caddy/Caddyfile"} --adapter caddyfile
\ No newline at end of file
+caddy run --config ${CADDYFILE_PATH}
\ No newline at end of file
diff --git a/scripts/build b/scripts/build
index e465fd3..f3d763b 100755
--- a/scripts/build
+++ b/scripts/build
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
+DOCKER_BUILDKIT=1
+
 if [[ $DEBUG != "" ]]; then
     set -x
 fi
-- 
2.51.2