upgrade makefile, add env var to mariadb

Makefile

@@ -1,13 +1,16 @@
 all: up
 
 run:
+	@mkdir -p /home/cchauvet/data/wp-files
+	@mkdir -p /home/cchauvet/data/wp-db
 	docker-compose -f srcs/docker-compose.yml up --build -d
 
 fclean:
 	-docker rm -f `docker ps -aq`
 	-docker volume rm -f `docker volume ls -q`
 	-docker image rm -f `docker image ls -aq`
-	-docker network rm -f `docker network ls -q`
+	-docker network rm `docker network ls -q`
 	-docker builder prune --all --force
+	rm -rf /home/cchauvet/data/wp-files /home/cchauvet/data/wp-db
 
 up: run

srcs/docker-compose.yml

@@ -1,17 +1,62 @@
+version: "3"
 services:
   nginx:
+    container_name: nginx
     image: nginx
     build: nginx
     ports:
       - "443:443"
     volumes:
       - wordpress:/var/www/wordpress
+    depends_on:
+      - wordpress
+    networks:
+      - inception
+    restart: always
 
   wordpress:
+    container_name: wordpress
     image: wordpress
     build: wordpress
     volumes:
       - wordpress:/var/www/wordpress
+    depends_on:
+      - mariadb
+    env_file:
+      - .env
+    networks:
+      - inception
+    restart: always
+
+  mariadb:
+    container_name: mariadb
+    image: mariadb
+    build: mariadb
+    volumes:
+      - mariadb:/data
+    env_file:
+      - .env
+    networks:
+      - inception
+    restart: always
 
 volumes:
+
   wordpress:
+    driver: local
+    driver_opts:
+      type: 'none'
+      o: 'bind'
+      device: '/home/cchauvet/data/wp-files/'
+
+  mariadb:
+    driver: local
+    driver_opts:
+      type: 'none'
+      o: 'bind'
+      device: '/home/cchauvet/data/wp-db/'
+
+
+networks:
+  inception:
+    driver: bridge

srcs/mariadb/Dockerfile

@@ -5,6 +5,6 @@ RUN apk update
 RUN apk add mariadb
 RUN mariadb-install-db
 RUN mkdir /run/mysqld
-COPY init.sql /etc
+COPY init.sql entrypoint.sh /etc/
 
-ENTRYPOINT ["mariadbd", "--no-defaults", "--user=root", "--datadir=/data", "--init-file=/etc/init.sql"]
+ENTRYPOINT ["sh", "/etc/entrypoint.sh"]

srcs/mariadb/entrypoint.sh

@@ -0,0 +1,6 @@
+sed -i "s/DB_USER/$DB_USER/g" /etc/init.sql
+sed -i "s/DB_PASS/$DB_PASS/g" /etc/init.sql
+
+cat /etc/init.sql >/dev/stderr
+
+exec mariadbd --no-defaults --user=root --datadir=/data --init-file=/etc/init.sql

srcs/mariadb/init.sql

@@ -1,2 +1,2 @@
 CREATE DATABASE wordpress;
-GRANT ALL PRIVILEGES ON wordpress.* TO 'wordpress'@'%' IDENTIFIED BY 'wordpress'; 
+GRANT ALL PRIVILEGES ON wordpress.* TO 'DB_USER'@'%' IDENTIFIED BY 'DB_PASS'; 

srcs/nginx/nginx.conf

@@ -10,7 +10,7 @@ server {
 	index index.php;
 
 	location / {
-		try_files $uri $uri/ =404;
+		try_files $uri $uri/ /index.php?$args;
 	}
 	location ~ \.php$ {
 		include fastcgi_params;