From bb844a428bd2030a3c9d9f764f839eb44510c11d Mon Sep 17 00:00:00 2001
From: asus <asus@example.com>
Date: Tue, 6 Feb 2024 18:34:25 +0100
Subject: [PATCH] small changes in volume gestion for db

---
 Makefile                             | 4 ----
 srcs/docker-compose.yml              | 2 ++
 srcs/requirements/mariadb/Dockerfile | 4 +++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 82535aa..9288ef4 100644
--- a/Makefile
+++ b/Makefile
@@ -89,11 +89,7 @@ build_logs:
 
 
 
-# before starting the containers with up,
-#  creating a README.md file inside some binded volumes dir
-#  to avoid them having their ownership overwritten by docker
 up:
-	echo "this is a binded docker volume for plugins" >> ${VOLUME_PLUGINS_D}/README.md
 	docker compose -f $(COMPOSE_FILE) up -d
 	@echo $(B_PURPLE)"you can now connect at "$(B_YELLOW)"https://$(WP_COMPLETE_URL)"$(B_PURPLE)" or 127.0.0.1"$(RESET)
 down:
diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml
index 7886728..6eef0db 100644
--- a/srcs/docker-compose.yml
+++ b/srcs/docker-compose.yml
@@ -46,6 +46,7 @@ services:
         - DB_NAME=${DB_NAME}
         - DB_USER=${DB_USER}
         - DB_PSWD=${DB_PSWD}
+        - DB_VOLUME_DIR=${DB_VOLUME_DIR}
     healthcheck:
       test: mariadb -h ${DB_HOST} -u ${DB_USER} -p"${DB_PSWD}" -e exit 2> /dev/null
       interval: 1s
@@ -76,6 +77,7 @@ services:
         condition: service_healthy
 
 # specify path to named volumes : https://docs.docker.com/compose/compose-file/compose-file-v3/#volume-configuration-reference
+# local driver options : https://stackoverflow.com/questions/62232676/docker-local-volume-driver-options
 volumes:
   db_volume:
     driver: local
diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile
index 528e8ba..78cd6e0 100644
--- a/srcs/requirements/mariadb/Dockerfile
+++ b/srcs/requirements/mariadb/Dockerfile
@@ -16,9 +16,11 @@ ARG DB_HOST
 ARG DB_NAME
 ARG DB_USER
 ARG DB_PSWD
+ARG DB_VOLUME_DIR
 
 # init mysql database
-RUN mysql_install_db --user=mysql --ldata=/var/lib/mysql && \
+# https://dev.mysql.com/doc/refman/5.7/en/mysql-install-db.html
+RUN mysql_install_db --user=mysql --datadir=${DB_VOLUME_DIR} && \
 	mkdir -p /var/run/mysqld && \
 	chown -R mysql:root /var/run/mysqld