go mario db

srcs/.env

@@ -1,10 +1,12 @@
 SQL_DATABASE=mariadb
 SQL_USER=www-http
 SQL_PASSWORD=vivementlaspe
+SQL_ROOT_PASSWORD=enorme
 DOMAIN_NAME=yantoine.42.fr
 WP_TITLE=LE_SUPER_SITE
 WP_ADMIN_USER=leboss
-WP_ADMIN_PASSWORD=legrand
+WP_ADMIN_PASSWORD=lemecfort
 WP_ADMIN_EMAIL=leboss@mail.com
 WP_NORMAL_USER=lestagiaire
+WP_NORMAL_USER_PASSWORD=rameneuncafe
 WP_NORMAL_USER_EMAIL=lestagiaire@mail.com

srcs/docker-compose.yml

@@ -1,10 +1,15 @@
   version: "3"
 
+  networks:
+   inception:
+     driver: bridge 
+
   services:
     nginx:
       container_name: nginx
+      image: nginx
       volumes:
-        - wordpress:/var/www/wordpress
+        - wp:/var/www/html
       networks:
         - inception
       depends_on:
@@ -20,8 +25,9 @@
     wordpress:
       container_name: wordpress
       env_file: .env
+      image: wordpress
       volumes:
-        - wordpress:/var/www/wordpress
+        - wp:/var/www/html
       networks:
         - inception
       build:
@@ -40,28 +46,26 @@
       build:
         context: ./requirements/mariadb
         dockerfile: Dockerfile
+      image: mariadb
       env_file: .env
       volumes:
-        - mariadb:/var/lib/mysql
+        - db:/var/lib/mysql
       restart: always
       expose:
         - "3306"
 
   volumes:
-    wordpress:
-      name: wordpress
+    wp:
       driver: local
       driver_opts:
         type: none
         o: bind
-        device: /home/yantoine/data/wordpress
-    mariadb:
+        device: ${HOME}/data/wp
+    db:
       driver: local
       driver_opts:
         type: none
         o: bind
-        device: /home/yantoine/data/mariadb
+        device: ${HOME}/data/db
+
 
-  networks:
-   inception:
-     driver: bridge 

srcs/requirements/mariadb/conf/50-server.cnf

@@ -1,3 +1,4 @@
+
 [mysqld]
 datadir = /var/lib/mysql
 socket  = /run/mysqld/mysqld.sock

srcs/requirements/wordpress/Dockerfile

@@ -1,19 +1,14 @@
 FROM debian:bullseye
-RUN apt-get update -y
-RUN apt-get upgrade -y
-RUN apt-get install wget -y
-RUN apt-get install php7.3 -y
-RUN apt-get install php-fpm -y
-RUN apt-get install php-mysql -y
-RUN apt-get install mariadb-client -y
-RUN wget https://fr.wordpress.org/wordpress-6.0-fr_FR.tar.gz -P /var/www 
-RUN cd /var/www && tar -xzf wordpress-6.0-fr_FR.tar.gz && rm wordpress-6.0-fr_FR.tar.gz
-RUN	chown -R root:root /var/www/wordpress
-COPY ./conf/www.conf /etc/php/7.3/fpm/pool.d/www.conf
-RUN wget https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
-RUN chmod +x wp-cli.phar
-RUN mv wp-cli.phar /usr/local/bin/wp
-COPY ./conf/auto_config.sh /auto_config.sh
-RUN chmod +x /auto_config.sh
-RUN mkdir -p /run/php
-ENTRYPOINT ["sh", "/auto_config.sh"]
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && \
+	apt-get install -y php-fpm php-mysql curl && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY ./tools/run.sh /run.sh
+
+RUN chmod +x /run.sh
+
+ENTRYPOINT [ "/run.sh" ]

srcs/requirements/wordpress/conf/auto_config.sh

@@ -1,10 +0,0 @@
-sleep 10
-wp config create	--allow-root \
-                    --dbname=$SQL_DATABASE \
-                    --dbuser=$SQL_USER \
-                    --dbpass=$SQL_PASSWORD \
-                    --dbhost=mariadb:3306 --path='/var/www/wordpress'
-
-wp core install --url=$DOMAIN_NAME --title="$WP_TITLE" --admin_user=$WP_ADMIN_USER --admin_password=$WP_ADMIN_PASSWORD --admin_email=$WP_ADMIN_EMAIL --allow-root
-wp user create $WP_NORMAL_USER $WP_NORMAL_USER_EMAIL --user_pass=$WP_NORMAL_USER_PASSWORD --role=author --allow-root
-./usr/sbin/php-fpm7.3 -F

srcs/requirements/wordpress/conf/www.conf

@@ -1,11 +0,0 @@
-[www]
-user = www-data
-group = www-data
-listen = wordpress:9000
-clear_env = no
-
-pm = dynamic
-pm.max_children = 5
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3

srcs/requirements/wordpress/tools/run.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+cd /var/www/html
+
+rm -rf *
+
+curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+
+chmod +x wp-cli.phar 
+
+mv wp-cli.phar /usr/local/bin/wp
+
+wp core download --allow-root
+
+mv /var/www/html/wp-config-sample.php /var/www/html/wp-config.php
+
+#line 23
+sed -i -r "s/database_name_here/$DB_NAME/1"   wp-config.php
+#line 26
+sed -i -r "s/username_here/$DB_USER/1"  wp-config.php
+#line 29
+sed -i -r "s/password_here/$DB_PWD/1"    wp-config.php
+
+#line 32
+sed -i -r "s/localhost/mariadb/1"    wp-config.php  #connect mariadb database
+
+wp core install --url=$DOMAIN_NAME/ --title=$WP_TITLE --admin_user=$WP_ADMIN_USR --admin_password=$WP_ADMIN_PWD --admin_email=$WP_ADMIN_EMAIL --skip-email --allow-root