Merge branch 'develop' of github.com:2pisoftware/cmfive-boilerplate i…

…nto feat/cmfive-docker-tweaks

Dockerfile

@@ -40,6 +40,7 @@ RUN apk --no-cache add \
     curl \
     wget \
     unzip \
+    icu-data-full \
     git
 
 # Link PHP cli
@@ -76,7 +77,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
 

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
@@ -67,8 +64,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