fix: joomla service

templates/compose/joomla-with-mariadb.yaml

@@ -2,20 +2,22 @@
 # slogan: Joomla! is the mobile-ready and user-friendly way to build your website. Choose from thousands of features and designs. Joomla! is free and open source. 
 # tags: cms, blog, content, management, mariadb
 # logo: svgs/joomla.svg
+# port: 80
 
 services:
   joomla:
-    image: 'joomla:latest'
+    image: joomla:latest
     volumes:
-      - 'joomla-files:/var/www/html'
+      - joomla_data:/var/www/html
     environment:
       - SERVICE_FQDN_JOOMLA
       - JOOMLA_DB_HOST=mariadb
-      - JOOMLA_DB_USER=$SERVICE_USER_JOOMLA
-      - JOOMLA_DB_PASSWORD=$SERVICE_PASSWORD_JOOMLA
-      - JOOMLA_DB_NAME=joomla
+      - JOOMLA_DB_USER=${SERVICE_USER_JOOMLA}
+      - JOOMLA_DB_PASSWORD=${SERVICE_PASSWORD_JOOMLA}
+      - JOOMLA_DB_NAME=${MYSQL_DATABASE:-joomla-db}
     depends_on:
-      - mariadb
+      mariadb:
+        condition: service_healthy
     healthcheck:
       test:
         - CMD
@@ -25,15 +27,16 @@ services:
       interval: 2s
       timeout: 10s
       retries: 10
+
   mariadb:
-    image: 'mariadb:11'
+    image: mariadb:11
     volumes:
-      - 'mariadb-data:/var/lib/mysql'
+      - joomla_mariadb_data:/var/lib/mysql
     environment:
-      - MYSQL_ROOT_PASSWORD=$SERVICE_PASSWORD_ROOT
-      - MYSQL_DATABASE=joomla
-      - MYSQL_USER=$SERVICE_USER_JOOMLA
-      - MYSQL_PASSWORD=$SERVICE_PASSWORD_JOOMLA
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_ROOT}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-joomla-db}
+      - MYSQL_USER=${SERVICE_USER_JOOMLA}
+      - MYSQL_PASSWORD=${SERVICE_PASSWORD_JOOMLA}
     healthcheck:
       test:
         - CMD
@@ -43,4 +46,3 @@ services:
       interval: 5s
       timeout: 20s
       retries: 10
-