done?

Makefile

@@ -11,10 +11,13 @@
 # **************************************************************************** #
 
 all:
+	-mkdir /home/apommier/wordpress
+	-mkdir /home/apommier/mariadb
 	docker-compose -f ./srcs/docker-compose.yml up --build
 
 fclean: down
-	-sudo rm -rf ./srcs/wordpress
+	-sudo rm -rf /home/apommier/wordpress
+	-sudo rm -rf /home/apommier/mariadb
 	-docker rm $$(docker ps -qa)
 	-docker rmi -f $$(docker images -qa)
 	-docker volume rm $$(docker volume ls -q)
@@ -28,6 +31,4 @@ back:
 down:
 	docker-compose -f ./srcs/docker-compose.yml down
 
-re: fclean
-	docker-compose -f ./srcs/docker-compose.yml build --no-cache
-	docker-compose -f ./srcs/docker-compose.yml up
+re: fclean all

srcs/.env

@@ -1,5 +1,6 @@
 WP_URL=apommier.42.fr
 WP_TITLE=wordpress
+WORDPRESS_DB_HOST=mariadb
 
 WP_ADMIN_LOGIN=admin
 WP_ADMIN_PASSWORD=admin

srcs/docker-compose.yml

@@ -5,11 +5,11 @@ services:
   nginx:
     build: requirements/nginx/
     container_name: nginx
+    image: nginx:homemade
     depends_on:
       - wordpress
     ports:
       - 443:443
-      - 80:80
     volumes:
       - wp_files:/var/www/html
     restart: unless-stopped
@@ -19,6 +19,7 @@ services:
   wordpress:
     build: ./requirements/wordpress
     container_name: wordpress
+    image: wordpress:homemade
     env_file: .env
     volumes:
      - wp_files:/var/www/html
@@ -31,11 +32,12 @@ services:
   mariadb:
     build: ./requirements/mariadb
     container_name: mariadb
+    image: mariadb:homemade
     ports:
       - 3306:3306
     env_file: .env
     volumes:
-      - wp_files:/var/www/html
+      - dbdata:/var/lib/mysql
     networks:
       - wpnetwork
     restart: unless-stopped
@@ -50,10 +52,10 @@ volumes:
       driver_opts:
         type: none
         o: 'bind'
-        device: './wordpress'
+        device: '/home/apommier/wordpress'
     dbdata:
       driver: local
       driver_opts:
         type: none
         o: 'bind'
-        device: './data/db'
+        device: '/home/apommier/mariadb'

srcs/requirements/mariadb/Dockerfile

@@ -14,11 +14,20 @@ FROM debian:buster
 RUN apt-get update -y
 RUN apt-get install -y mariadb-client mariadb-common mariadb-server
 RUN sed -i 's/bind-address/bind-address = 0.0.0.0 #/i' /etc/mysql/mariadb.conf.d/50-server.cnf
+
 RUN mkdir /mysql_scripts
 COPY ./tools/ /mysql_scripts/
+EXPOSE 3306
 
-RUN echo $MARIADB_DATABASE --dckerfi
-RUN sh mysql_scripts/sqlStart.sh
+ENTRYPOINT ["bash", "mysql_scripts/sqlStart.sh"]
 #RUN service mysql start && mysql < /mysql_scripts/mySqlScript.sql
 
-CMD ["mysqld"]
+
+
+#CMD ["service", "mysql", "start", "&&","mysqld"]
+#CMD ["mysqld"]
+#CMD ["mysqld", "--bind-address=0.0.0.0"]
+
+#CMD ["bash", "mysql_scripts/sqlStart.sh"]
+#ENTRYPOINT ["mysqld"]
+

srcs/requirements/mariadb/tools/mysql2

@@ -1,4 +0,0 @@
-create database if not exists wordpress;
-create user 'apommier'@'%' identified by '1234';
-grant all privileges on *.* to 'apommier'@'%';
-flush privileges;

srcs/requirements/mariadb/tools/sqlStart.sh

@@ -1,15 +1,19 @@
+#!/bin/bash
 service mysql start
+#service mysql start && mysql < /mysql_scripts/mySqlScript.sql
 
-printenv
-echo Starting sql
-echo $MARIADB_DATABASE -- data
-echo $MARIADB_USER -- user
-cat << EOF > mysql
+mysql << EOF
 
-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'@'%';
+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
+#mysqld --datadir='/home/mariadb'
+service mysql stop
+mysqld
+#/etc/init.d/mysql stop
+
+#exec "$@"
+

srcs/requirements/wordpress/tools/start.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+	sleep 5
 	sed -i "s/listen = \/run\/php\/php7.3-fpm.sock/listen = 9000/" "/etc/php/7.3/fpm/pool.d/www.conf";
 	mkdir -p /run/php/;
 	touch /run/php/php7.3-fpm.pid;
@@ -15,7 +16,8 @@ then
     echo "Wordpress: downloading..."
 	wp core download --locale=fr_FR --allow-root;
     echo "Wordpress: configuration..."
-	mv /var/www/tools/wp-config.php /var/www/html/
+	wp config create --dbname=${MARIADB_DATABASE} --dbuser=${MARIADB_USER} --dbpass=${MARIADB_PASSWORD} --dbhost=${WORDPRESS_DB_HOST} --skip-check --allow-root
+	#mv /var/www/tools/wp-config.php /var/www/html/
 	echo "Wordpress: installation...";
     wp core install --url=${WP_URL} --title=${WP_TITLE} --admin_user=${WP_ADMIN_LOGIN} --admin_password=${WP_ADMIN_PASSWORD} --admin_email="${WP_ADMIN_EMAIL}" --skip-email --allow-root;
     echo "Wordpress: create user...";