From a6f4eb247f6e74ef92c1a7fd13c4415c3ce33fe8 Mon Sep 17 00:00:00 2001
From: Tom Conner <tom@tomconner.dev>
Date: Sun, 19 Nov 2023 00:40:26 +0000
Subject: [PATCH] debugging

---
 .gitignore          |  3 ++-
 caddy/Caddyfile     | 17 ++++++++++++++++-
 caddy/Dockerfile    |  8 ++++++++
 docker-compose.yaml |  8 +++++++-
 server/Dockerfile   |  1 +
 5 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 caddy/Dockerfile

diff --git a/.gitignore b/.gitignore
index 57c9727..0d37854 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ themes/**
 server/.env
 __pycache__
 .hugo_build.lock
-venv
\ No newline at end of file
+venv
+db/tree105.sqlite
diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 8d52e74..ffa91cd 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,3 +1,13 @@
+# {
+#     order l4 before http
+# }
+
+# l4 :5678 {
+#     route {
+#         forward_to tree105-server-1:5678
+#     }
+# }
+
 dev.troop105treedrive.com {
     handle /api/* {
         reverse_proxy tree105-server-1:4242
@@ -8,4 +18,9 @@ dev.troop105treedrive.com {
     handle {
         reverse_proxy tree105-generator-1:1313
     }
-}
\ No newline at end of file
+}
+
+# dev.troop105treedrive.com:5678 {
+#     reverse_proxy tree105-server-1:5678
+# }
+
diff --git a/caddy/Dockerfile b/caddy/Dockerfile
new file mode 100644
index 0000000..55ad42c
--- /dev/null
+++ b/caddy/Dockerfile
@@ -0,0 +1,8 @@
+FROM caddy:builder AS builder
+
+RUN xcaddy build \
+    --with github.com/mholt/caddy-l4
+
+FROM caddy:latest
+
+COPY --from=builder /usr/bin/caddy /usr/bin/caddy
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index e74de78..32b53ce 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,6 +3,8 @@ services:
 
   caddy:
     image: caddy:2.7.5
+      # build:
+      #   context: ./caddy
     restart: unless-stopped
     cap_add:
       - NET_ADMIN
@@ -10,6 +12,8 @@ services:
       - "80:80"
       - "443:443"
       - "443:443/udp"
+    # expose:
+    #   - 5678
     working_dir: /tree105/caddy
     volumes:
       - ./caddy/Caddyfile:/etc/caddy/Caddyfile
@@ -25,8 +29,10 @@ services:
       context: ./server
     working_dir: /tree105/server
     command: python server.py
+    #command: python -m debugpy --listen 0.0.0.0:5678 server.py
     ports:
       - "4242:4242"
+      # - "5678:5678"
     volumes:
       - .:/tree105
     networks:
@@ -43,7 +49,7 @@ services:
       - .:/tree105
     networks:
       - default
-      
+
 volumes:
   tree105:
   caddy_data:
diff --git a/server/Dockerfile b/server/Dockerfile
index b62fa49..6a10d3f 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -3,3 +3,4 @@ COPY ./requirements.txt .
 RUN pip install -r requirements.txt
 VOLUME /tree105
 EXPOSE 4242
+#EXPOSE 4242 5678