From 57e6dfb41189b44000c138563e1a33e3fa16f019 Mon Sep 17 00:00:00 2001
From: Matt Bell <matt@2pisoftware.com>
Date: Wed, 21 Feb 2024 23:09:11 +1100
Subject: [PATCH 1/2] Update healthcheck intervals and paths

---
 Dockerfile         | 2 +-
 docker-compose.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7e9b12f..cd3f46e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,7 +76,7 @@ WORKDIR /var/www/html
 RUN rm -rf .codepipeline
 
 # Healthcheck to ensure nginx is running and cmfive is installed
-HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=15 \
+HEALTHCHECK --interval=15s --timeout=5m --start-period=5s --retries=15 \
   CMD curl -s -o /dev/null -w "%{http_code}" http://localhost | grep -q -E "^[1-3][0-9]{2}$" && \
       test -f /home/cmfive/.cmfive-installed
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a2cc08..3d02c43 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -66,8 +66,8 @@ services:
       test: 
         - "CMD-SHELL"
         - "ps aux | grep 'npm run watch' | grep -v grep"
-        - "test -f system/templates/base/dist/app.css"
-      interval: 10s
+        - "test -f /var/www/html/system/templates/base/dist/app.css"
+      interval: 15s
       timeout: 5m
       retries: 20
     restart: unless-stopped

From e3d8f1455032219adf6d968781692ab341c157eb Mon Sep 17 00:00:00 2001
From: Matt Bell <matt@2pisoftware.com>
Date: Wed, 21 Feb 2024 23:50:09 +1100
Subject: [PATCH 2/2] Restore container_name

---
 docker-compose.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 3d02c43..691b93f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,10 +26,7 @@ services:
 
   webapp:
     image: ghcr.io/2pisoftware/cmfive:develop
-    # build:
-    #   context: .
-    #   dockerfile: Dockerfile
-    # container_name: cmfive
+    container_name: cmfive
     hostname: nginx-php8.1
     environment:
       - TZ=Australia/Sydney