From 4b11f979461f2b29f0b02105152d14457adbc406 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Thu, 16 Jan 2025 14:17:28 +0100
Subject: [PATCH] fix: joomla service

---
 templates/compose/joomla-with-mariadb.yaml | 28 ++++++++++++----------
 templates/service-templates.json           | 15 ++++++++++++
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/templates/compose/joomla-with-mariadb.yaml b/templates/compose/joomla-with-mariadb.yaml
index a6eeb59f2..8569d2391 100644
--- a/templates/compose/joomla-with-mariadb.yaml
+++ b/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
-
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 5c646838f..080e263df 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -1420,6 +1420,21 @@
         "minversion": "0.0.0",
         "port": "8080"
     },
+    "joomla-with-mariadb": {
+        "documentation": "https://joomla.org?utm_source=coolify.io",
+        "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.",
+        "compose": "c2VydmljZXM6CiAgam9vbWxhOgogICAgaW1hZ2U6ICdqb29tbGE6bGF0ZXN0JwogICAgdm9sdW1lczoKICAgICAgLSAnam9vbWxhX2RhdGE6L3Zhci93d3cvaHRtbCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9KT09NTEEKICAgICAgLSBKT09NTEFfREJfSE9TVD1tYXJpYWRiCiAgICAgIC0gJ0pPT01MQV9EQl9VU0VSPSR7U0VSVklDRV9VU0VSX0pPT01MQX0nCiAgICAgIC0gJ0pPT01MQV9EQl9QQVNTV09SRD0ke1NFUlZJQ0VfUEFTU1dPUkRfSk9PTUxBfScKICAgICAgLSAnSk9PTUxBX0RCX05BTUU9JHtNWVNRTF9EQVRBQkFTRTotam9vbWxhLWRifScKICAgIGRlcGVuZHNfb246CiAgICAgIG1hcmlhZGI6CiAgICAgICAgY29uZGl0aW9uOiBzZXJ2aWNlX2hlYWx0aHkKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovLzEyNy4wLjAuMScKICAgICAgaW50ZXJ2YWw6IDJzCiAgICAgIHRpbWVvdXQ6IDEwcwogICAgICByZXRyaWVzOiAxMAogIG1hcmlhZGI6CiAgICBpbWFnZTogJ21hcmlhZGI6MTEnCiAgICB2b2x1bWVzOgogICAgICAtICdqb29tbGFfbWFyaWFkYl9kYXRhOi92YXIvbGliL215c3FsJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gJ01ZU1FMX1JPT1RfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX1JPT1R9JwogICAgICAtICdNWVNRTF9EQVRBQkFTRT0ke01ZU1FMX0RBVEFCQVNFOi1qb29tbGEtZGJ9JwogICAgICAtICdNWVNRTF9VU0VSPSR7U0VSVklDRV9VU0VSX0pPT01MQX0nCiAgICAgIC0gJ01ZU1FMX1BBU1NXT1JEPSR7U0VSVklDRV9QQVNTV09SRF9KT09NTEF9JwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGhlYWx0aGNoZWNrLnNoCiAgICAgICAgLSAnLS1jb25uZWN0JwogICAgICAgIC0gJy0taW5ub2RiX2luaXRpYWxpemVkJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "tags": [
+            "cms",
+            "blog",
+            "content",
+            "management",
+            "mariadb"
+        ],
+        "logo": "svgs/joomla.svg",
+        "minversion": "0.0.0",
+        "port": "80"
+    },
     "joplin": {
         "documentation": "https://github.com/laurent22/joplin/blob/dev/packages/server/README.md?utm_source=coolify.io",
         "slogan": "Self-hosted sync server for Joplin",