From c47b1fc23ff73f2198cfcbdcdccebb88153fce3b Mon Sep 17 00:00:00 2001
From: Brock H Caldwell <brock@caldwellnetworks.com>
Date: Mon, 19 May 2025 16:36:37 -0500
Subject: [PATCH] fix: uses actual app container for dev

---
 bash/caddy/Caddyfile |  2 +-
 compose.yml          | 21 +++++++++++++++++----
 composer.json        |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/bash/caddy/Caddyfile b/bash/caddy/Caddyfile
index 658020d..f77794f 100644
--- a/bash/caddy/Caddyfile
+++ b/bash/caddy/Caddyfile
@@ -2,5 +2,5 @@ dev.caldwell.digital:443
 
 tls /etc/ssl/wildcard.crt /etc/ssl/wildcard.pem
 
-reverse_proxy php:80
+reverse_proxy app:80
 
diff --git a/compose.yml b/compose.yml
index e750ecb..e66579a 100755
--- a/compose.yml
+++ b/compose.yml
@@ -19,24 +19,33 @@ services:
     command: redis-server --maxmemory 512MB
     restart: unless-stopped
 
-  php:
-    build: .
+  app:
+    image: code.caldwell.digital/home/torsearch:0.14.5-app
     volumes:
       - ./:/var/www
+    depends_on:
+      database:
+        condition: service_healthy
 
   worker:
-    build: .
+    image: code.caldwell.digital/home/torsearch:0.14.5-worker
     volumes:
       - ./:/var/www
       - ./var/download:/var/download
     command: php ./bin/console messenger:consume async -vvv --time-limit=3600
+    depends_on:
+      app:
+        condition: service_healthy
 
   scheduler:
-    build: .
+    image: code.caldwell.digital/home/torsearch:0.14.5-worker
     volumes:
       - ./:/var/www
       - ./var/download:/var/download
     command: php ./bin/console messenger:consume scheduler_monitor -vv --time-limit=3600
+    depends_on:
+      app:
+        condition: service_healthy
 
   mercure:
     image: dunglas/mercure
@@ -67,6 +76,10 @@ services:
       MYSQL_USERNAME: app
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: password
+    healthcheck:
+      test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ]
+      timeout: 10s
+      retries: 10
 
   adminer:
     image: adminer
diff --git a/composer.json b/composer.json
index cc85ff2..ab9392b 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
         "post-update-cmd": [
             "@auto-scripts"
         ],
-        "sym": "docker compose exec php ./bin/console"
+        "sym": "docker compose exec app ./bin/console"
     },
     "conflict": {
         "symfony/symfony": "*"