From f8010a6b41fe9cd24c1787bfb1c6ca9c15c36a0c Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Sat, 16 Dec 2023 21:44:00 -0800
Subject: [PATCH] updated the docker compose file

---
 docker-compose.yml | 89 ++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 47 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b5845c5..c817ea5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,47 +1,42 @@
-version: '3.8'
-
-# For Staging
-# docker-compose -f docker-compose.yml -f docker-compose.staging.yml --env-file .env.staging up -d
-#
-# For Production
-# docker-compose up -d
-
-
-volumes:
-  joomla-db:
-  joomla:
-
-networks:
-  default:
-    external:
-      name: ${NETWORKNAME}
-
-services:
-  mariadb-joomla:
-    image: mariadb:10.7.1 # https://hub.docker.com/_/mariadb
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_USER: ${MYSQL_USER}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-      MYSQL_DATABASE: ${MYSQL_DATABASE}
-    volumes:
-      - joomla-db:/var/lib/mysql
-      - "/etc/timezone:/etc/timezone:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-
-  joomla:
-    image: joomla:4.3.2 # https://hub.docker.com/_/joomla
-    restart: always
-    environment:
-      JOOMLA_DB_HOST: mariadb-joomla
-      JOOMLA_DB_USER: ${MYSQL_USER}
-      JOOMLA_DB_PASSWORD: ${MYSQL_PASSWORD}
-      JOOMLA_DB_NAME: ${MYSQL_DATABASE}
-    volumes:
-      - ./html:/var/www/html
-      - ./php/php.ini:/usr/local/etc/php/php.ini
-      - "/etc/timezone:/etc/timezone:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-    links:
-      - mariadb-joomla
+version: '3.8'
+
+# For Staging
+# docker-compose -f docker-compose.yml -f docker-compose.staging.yml --env-file .env.staging up -d
+#
+# For Production
+# docker-compose up -d
+
+networks:
+  default:
+    external:
+      name: ${NETWORKNAME}
+
+services:
+  mariadb-joomla:
+    image: mariadb:11.2.2 # https://hub.docker.com/_/mariadb
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+    volumes:
+      - ./data/joomla-db:/var/lib/mysql
+      - "/etc/timezone:/etc/timezone:ro"
+      - "/etc/localtime:/etc/localtime:ro"
+
+  joomla:
+    image: joomla:4.4.1 # https://hub.docker.com/_/joomla
+    restart: always
+    environment:
+      JOOMLA_DB_HOST: mariadb-joomla
+      JOOMLA_DB_USER: ${MYSQL_USER}
+      JOOMLA_DB_PASSWORD: ${MYSQL_PASSWORD}
+      JOOMLA_DB_NAME: ${MYSQL_DATABASE}
+    volumes:
+      - ./data/html:/var/www/html
+      - ./php/php.ini:/usr/local/etc/php/php.ini
+      - "/etc/timezone:/etc/timezone:ro"
+      - "/etc/localtime:/etc/localtime:ro"
+    links:
+      - mariadb-joomla