From 131b7eab377ab9084b1c50a92b4f055dcc0af0fa Mon Sep 17 00:00:00 2001
From: reid <reid@scogg.in>
Date: Thu, 24 Nov 2022 19:40:55 -0600
Subject: [PATCH] use pinned caddy version, add cf dns

---
 api/np_db.py     |  2 --
 caddy/Dockerfile | 24 +++++++-----------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/api/np_db.py b/api/np_db.py
index 8916957..e41ec5d 100644
--- a/api/np_db.py
+++ b/api/np_db.py
@@ -297,7 +297,6 @@ def rectify_svc_list(pubkey):
             upstr = services[subd]
             if caddy_api.check_upstream(subd,upstr) == False:
                 caddy_api.add_reverse_proxy(subd, host=f'{root_domain}',upstream=upstr)
-                sleep(3)
 
         # Delete pubkeys that aren't registered
         for peer in peerlist:
@@ -311,7 +310,6 @@ def rectify_svc_list(pubkey):
             upstr = minios[subd]
             if caddy_api.check_upstream(subd,upstr) == False:
                 caddy_api.add_minio(subd, host=f'{root_domain}',upstream=upstr)
-                sleep(3)
 
         # Rectify port forwarding configurations
         # Add a 'tcp' key for TCP services
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
index 53a047f..2f2bc96 100644
--- a/caddy/Dockerfile
+++ b/caddy/Dockerfile
@@ -1,23 +1,13 @@
-# Build Caddy from master until 2.6 release
-FROM golang:1.19.1-alpine3.16 as builder
-WORKDIR /
-RUN apk add --no-cache git
-RUN git clone https://github.com/caddyserver/caddy.git
-WORKDIR /caddy/cmd/caddy/
-RUN go build
-
-FROM caddy:2-alpine
-WORKDIR /
-RUN rm /usr/bin/caddy
-COPY --from=builder /caddy/cmd/caddy/caddy /usr/bin/caddy
-RUN chmod +x /usr/bin/caddy
-RUN apk add --no-cache libcap curl
-RUN setcap 'cap_net_bind_service=+ep' /usr/bin/caddy
+FROM caddy:2.6.2-builder-alpine@sha256:735ad7b9a5ba5baf3df5f93034af5fa90c3554da9725d260df238d2511be6b23 AS builder
+RUN xcaddy build \
+    --with github.com/caddy-dns/cloudflare@latest
+FROM caddy:2.6-alpine@sha256:7992b931b7da3cf0840dd69ea74b2c67d423faf03408da8abdc31b7590a239a7
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy
 COPY ./default_config.json /etc/caddy/
-COPY ./www/502.html /www/
+RUN apk add curl
 RUN echo "#!/bin/ash" > /init
 RUN echo "ip route add 10.13.13.0/24 via 172.20.0.2" >> /init
-RUN echo "exec caddy run --config /etc/caddy/default_config.json --resume" >> /init
+RUN echo "exec /usr/bin/caddy run --config /etc/caddy/default_config.json --resume" >> /init
 RUN chmod +x /init
 EXPOSE 80
 EXPOSE 443