refactor: caddy init script

core/caddy/compose.yml

@@ -27,7 +27,9 @@ volumes:
     name: caddy-caddyfiles
     external: true
   caddy-data:
+    name: caddy-data
   caddy-config:
+    name: caddy-config
   caddy-diagrams:
     name: caddy-diagrams
     external: true

core/caddy/config/Caddyfile

@@ -1,5 +1,5 @@
 {
-	local_certs
+	#local_certs
 	default_bind 0.0.0.0
 }
 

core/keycloak/compose.yml

@@ -1,3 +1,6 @@
+include:
+  - ../postgresql/compose.yml
+
 services:
   keycloak:
     image: quay.io/keycloak/keycloak
@@ -8,6 +11,8 @@ services:
       - proxy
     env_file:
       - runtime.env
+    depends_on:
+      - postgres
     environment:
       KC_DB: postgres
       KC_DB_URL: jdbc:postgresql://postgres:3212/keycloak

core/tools/caddy-init.sh

@@ -2,8 +2,18 @@
 
 DRAWIO_VERSION="29.5.2"
 
-docker volume create caddy-caddyfiles
-docker volume create caddy-diagrams
+create_volume_if_missing() {
+  local vol="$1"
+  if docker volume inspect "$vol" > /dev/null 2>&1; then
+    echo "Volume '$vol' already exists, skipping."
+  else
+    echo "Creating volume '$vol'..."
+    docker volume create "$vol"
+  fi
+}
+
+create_volume_if_missing caddy-caddyfiles
+create_volume_if_missing caddy-diagrams
 
 docker run --rm \
   -v /home/bapasqui/projects/ft_chatons/core/caddy/config:/src:ro \
@@ -11,20 +21,19 @@ docker run --rm \
   alpine cp -r /src/. /etc/caddy/
 
 
+if docker run --rm -v caddy-diagrams:/srv/diagrams alpine ls /srv/diagrams/index.html > /dev/null 2>&1; then
+  echo "draw.io already deployed in caddy-diagrams, skipping download."
+else
+  echo "Deploying draw.io ${DRAWIO_VERSION}..."
   mkdir -p /tmp/drawio-extract
   wget -v \
     "https://github.com/jgraph/drawio/releases/download/v${DRAWIO_VERSION}/draw.war" \
     -O /tmp/drawio.war
   unzip -q /tmp/drawio.war -d /tmp/drawio-extract
   rm /tmp/drawio.war
-
   docker run --rm \
     -v /tmp/drawio-extract:/src:ro \
     -v caddy-diagrams:/srv/diagrams \
     alpine cp -r /src/. /srv/diagrams/
-
-docker run --rm \
-  -v caddy-diagrams:/srv/diagrams \
-  alpine ls /srv/diagrams
-
   rm -rf /tmp/drawio-extract
+fi