From 663f1b759d3ad569f443f9302ea591a9115aa042 Mon Sep 17 00:00:00 2001
From: Tord-Vincent Heggland <tordvh@hotmail.no>
Date: Sat, 14 Mar 2026 11:07:28 +0100
Subject: [PATCH] caddydonesoon

---
 Dockerfile          | 10 ++++++++++
 docker-compose.yaml | 27 +++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..468e0e8
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM caddy:2-builder AS builder
+
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    xcaddy build \
+    --with github.com/mholt/caddy-ratelimit
+
+FROM caddy:2
+
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a72ee45..2579cf7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,18 +28,33 @@ services:
     networks:
       - gitea_net
 
-  cloudflared:
-    image: cloudflare/cloudflared:latest
-    container_name: cloudflared
+
+  caddy:
+    build: .
+    container_name: caddy
     restart: unless-stopped
-    command: tunnel --no-autoupdate run
-    environment:
-      TUNNEL_TOKEN: "${CLOUDFLARE_TUNNEL_TOKEN}"
     depends_on:
       - gitea
+    ports:
+      - "80:80"
+      - "443:443"
+    env_file:
+      - .env
+    volumes:
+      - ./Caddyfile:/etc/caddy/Caddyfile:ro
+      - caddy_data:/data
+      - caddy_config:/config
     networks:
       - gitea_net
 
+
+
 networks:
   gitea_net:
     driver: bridge
+
+
+
+volumes:
+  caddy_data:
+  caddy_config: