From cfb62cbc68180c95221232ed1bb107e147e56b84 Mon Sep 17 00:00:00 2001
From: kinou-p <alexpomms@gmail.com>
Date: Fri, 7 Oct 2022 07:48:47 +0200
Subject: [PATCH] not done in fact

---
 srcs/.env                                     |  2 +-
 srcs/docker-compose.yml                       | 29 ++++++++++++-------
 srcs/requirements/mariadb/Dockerfile          |  4 ++-
 .../mariadb/tools/mySqlScript.sql             |  8 ++---
 srcs/requirements/mariadb/tools/mysql2        |  4 +++
 srcs/requirements/mariadb/tools/sqlStart.sh   | 15 ++++++++++
 6 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 srcs/requirements/mariadb/tools/mysql2
 create mode 100644 srcs/requirements/mariadb/tools/sqlStart.sh

diff --git a/srcs/.env b/srcs/.env
index afcbbab..1b74ddc 100644
--- a/srcs/.env
+++ b/srcs/.env
@@ -12,4 +12,4 @@ WP_USER_EMAIL=apommier@student.42.fr
 MARIADB_DATABASE=wordpress
 MARIADB_USER=apommier
 MARIADB_PASSWORD=1234
-
+MARIADB_ROOT_PASSWORD=1234
diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml
index 0fde076..78facae 100644
--- a/srcs/docker-compose.yml
+++ b/srcs/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - 443:443
       - 80:80
     volumes:
-      - ./wordpress:/var/www/html
+      - wp_files:/var/www/html
     restart: unless-stopped
     networks:
       - wpnetwork
@@ -19,10 +19,9 @@ services:
   wordpress:
     build: ./requirements/wordpress
     container_name: wordpress
-    env_file:
-      - .env
+    env_file: .env
     volumes:
-     - ./wordpress:/var/www/html
+     - wp_files:/var/www/html
     depends_on:
       - mariadb
     networks:
@@ -32,12 +31,11 @@ services:
   mariadb:
     build: ./requirements/mariadb
     container_name: mariadb
-    environment:
-      - MARIADB_DATABASE=${MARIADB_DATABASE}
-      - MARIADB_USER=${MARIADB_USER}
-      - MARIADB_PASSWORD=${MARIADB_PASSWORD}
+    ports:
+      - 3306:3306
+    env_file: .env
     volumes:
-      - ./wordpress:/var/www/html
+      - wp_files:/var/www/html
     networks:
       - wpnetwork
     restart: unless-stopped
@@ -47,4 +45,15 @@ networks:
     driver: bridge
 
 volumes:
-  wp_data:
\ No newline at end of file
+    wp_files:
+      driver: local
+      driver_opts:
+        type: none
+        o: 'bind'
+        device: './wordpress'
+    dbdata:
+      driver: local
+      driver_opts:
+        type: none
+        o: 'bind'
+        device: './data/db'
\ No newline at end of file
diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile
index a901dc4..405cb9a 100644
--- a/srcs/requirements/mariadb/Dockerfile
+++ b/srcs/requirements/mariadb/Dockerfile
@@ -17,6 +17,8 @@ RUN sed -i 's/bind-address/bind-address = 0.0.0.0 #/i' /etc/mysql/mariadb.conf.d
 RUN mkdir /mysql_scripts
 COPY ./tools/ /mysql_scripts/
 
-RUN service mysql start && mysql < /mysql_scripts/mySqlScript.sql
+RUN echo $MARIADB_DATABASE --dckerfi
+RUN sh mysql_scripts/sqlStart.sh
+#RUN service mysql start && mysql < /mysql_scripts/mySqlScript.sql
 
 CMD ["mysqld"]
\ No newline at end of file
diff --git a/srcs/requirements/mariadb/tools/mySqlScript.sql b/srcs/requirements/mariadb/tools/mySqlScript.sql
index fb6c242..8e73cd0 100644
--- a/srcs/requirements/mariadb/tools/mySqlScript.sql
+++ b/srcs/requirements/mariadb/tools/mySqlScript.sql
@@ -1,4 +1,4 @@
-create database if not exists wordpress;
-create user 'apommier'@'%' identified by '1234';
-grant all privileges on *.* to 'apommier'@'%';
-flush privileges;
\ No newline at end of file
+CREATE DATABASE IF NOT EXISTS $MARIADB_DATABASE;
+CREATE USER IF NOT EXISTS '$MARIADB_USER'@'%' IDENTIFIED BY '$MARIADB_PASSWORD';
+GRANT ALL PRIVILEGES ON *.* TO '$MARIADB_USER'@'%';
+FLUSH PRIVILEGES;
\ No newline at end of file
diff --git a/srcs/requirements/mariadb/tools/mysql2 b/srcs/requirements/mariadb/tools/mysql2
new file mode 100644
index 0000000..fb6c242
--- /dev/null
+++ b/srcs/requirements/mariadb/tools/mysql2
@@ -0,0 +1,4 @@
+create database if not exists wordpress;
+create user 'apommier'@'%' identified by '1234';
+grant all privileges on *.* to 'apommier'@'%';
+flush privileges;
\ No newline at end of file
diff --git a/srcs/requirements/mariadb/tools/sqlStart.sh b/srcs/requirements/mariadb/tools/sqlStart.sh
new file mode 100644
index 0000000..6f5bc43
--- /dev/null
+++ b/srcs/requirements/mariadb/tools/sqlStart.sh
@@ -0,0 +1,15 @@
+service mysql start 
+
+printenv
+echo Starting sql
+echo $MARIADB_DATABASE -- data
+echo $MARIADB_USER -- user
+cat << EOF > mysql
+
+CREATE DATABASE IF NOT EXISTS $MARIADB_DATABASE;
+CREATE USER IF NOT EXISTS '$MARIADB_USER'@'%' IDENTIFIED BY '$MARIADB_PASSWORD';
+GRANT ALL PRIVILEGES ON *.* TO '$MARIADB_USER'@'%';
+FLUSH PRIVILEGES;
+EOF
+
+exit