From 450dbd3cc1b583b34c229e6627b38bce46304da0 Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Fri, 17 Jan 2025 15:34:20 +0000
Subject: [PATCH] Updated container definitions for deployment via docker
 compose

---
 caddy/Caddyfile     | 14 ++++++++++++++
 conf/Caddyfile      |  7 -------
 conf/caddy_start.sh |  7 -------
 docker-compose.yaml |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 caddy/Caddyfile
 delete mode 100644 conf/Caddyfile
 delete mode 100644 conf/caddy_start.sh

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
new file mode 100644
index 0000000..3e17638
--- /dev/null
+++ b/caddy/Caddyfile
@@ -0,0 +1,14 @@
+{
+    admin off
+}
+
+am-d-model.eu {
+    tls internal
+
+    reverse_proxy site:3000 {
+        health_uri /health
+        health_interval 30s
+        health_timeout 10s
+        health_status 200
+    }
+}
diff --git a/conf/Caddyfile b/conf/Caddyfile
deleted file mode 100644
index 82a0724..0000000
--- a/conf/Caddyfile
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    admin off
-}
-
-am-d-model.eu {
-    reverse_proxy AM-D-Model_site:3000
-}
diff --git a/conf/caddy_start.sh b/conf/caddy_start.sh
deleted file mode 100644
index 9f0bc77..0000000
--- a/conf/caddy_start.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -x  # Enable debug output
-mkdir -p /etc/caddy
-curl -v https://raw.githubusercontent.com/Cian-H/am-d-model.eu/refs/heads/prod/conf/Caddyfile > /etc/caddy/Caddyfile
-ls -la /etc/caddy/Caddyfile  # Verify file exists and permissions
-cat /etc/caddy/Caddyfile     # Print contents to log
-exec caddy run --config /etc/caddy/Caddyfile
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 559bd6e..f2d7e1a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -14,7 +14,7 @@ services:
     restart: unless-stopped
 
   caddy:
-    image: caddy:latest
+    image: docker.io/library/caddy:latest
     depends_on:
         - site
     networks:
@@ -24,10 +24,10 @@ services:
     volumes:
       - caddy_data:/data
       - caddy_config:/config
-    command: >
-      sh -c "wget -O /etc/caddy/Caddyfile https://raw.githubusercontent.com/Cian-H/am-d-model.eu/refs/heads/main/conf/Caddyfile &&
-      caddy run --config /etc/caddy/Caddyfile"
+      - ./caddy:/etc/caddy
     restart: unless-stopped
+    labels:
+      - "io.containers.autoupdate=registry"
 
 volumes:
   caddy_data: