clean2 - no makefile

srcs/docker-compose.yml

@@ -22,8 +22,8 @@ services:
 
   wordpress:
     build: ./requirements/wordpress
+    container_name: wordpress
     volumes:
-     # - wpfiles:/var/www/html
      - ./wordpress:/var/www/html
     depends_on:
       - mariadb
@@ -34,21 +34,7 @@ services:
   mariadb:
     build: ./requirements/mariadb
     container_name: mariadb
-    #image: mariadb:latest
-    #container_name: mariadb
-    #environment:
-     # MARIADB_DATABASE: wp
-     # MARIADB_USER: wp
-     # MARIADB_PASSWORD: secret
-     # MARIADB_ROOT_PASSWORD: secret
-      #mariadb_DATABASE: wp
-      #mariadb_USER: wp
-      #mariadb_PASSWORD: secret
-      #mariadb_ROOT_PASSWORD: secret
-
     volumes:
-      #- ./requirements/mariadb:/var/lib/mariadb
-      #- wpfiles:/var/www/html
       - ./wordpress:/var/www/html
     networks:
       - wpnetwork

srcs/requirements/mariadb/.dockerignore

@@ -0,0 +1 @@
+.git

srcs/requirements/nginx/.dockerignore

@@ -0,0 +1 @@
+.git

srcs/requirements/nginx/Dockerfile

@@ -19,6 +19,6 @@ RUN         mkdir -p /etc/ssl/private
 RUN         mkdir -p /etc/ssl/certs
 RUN         openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt -subj "/C=FR/ST=17/L=StJeanDeLiversay/O=42/CN=apommier" 
 
-COPY		conf/nginx2.conf /etc/nginx/conf.d/default.conf
+COPY		conf/nginx.conf /etc/nginx/conf.d/default.conf
 
 ENTRYPOINT ["nginx", "-g", "daemon off;"]

srcs/requirements/wordpress/.dockerignore

@@ -0,0 +1 @@
+.git

srcs/requirements/wordpress/Dockerfile

@@ -17,7 +17,6 @@ RUN apt-get -y install php7.3 php-mysqli php-fpm wget sendmail sudo
 
 EXPOSE 9000
 
-#COPY ./conf/www.conf /etc/php/7.3/fpm/pool.d
 COPY ./tools /var/www/tools
 
 RUN chmod +x /var/www/tools/start.sh

srcs/requirements/wordpress/tools/start.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
 	sed -i "s/listen = \/run\/php\/php7.3-fpm.sock/listen = 9000/" "/etc/php/7.3/fpm/pool.d/www.conf";
-#	chown -R www-data:www-data /var/www/*;
-#	chown -R 755 /var/www/*;
 	mkdir -p /run/php/;
 	touch /run/php/php7.3-fpm.pid;
 
@@ -15,16 +13,12 @@ if [ ! -f /var/www/html/wp-config.php ]; then
 	cd /var/www/html;
     echo "Wordpress: downloading..."
 	wp core download --locale=fr_FR --allow-root;
-	#echo "Wordpress: creating users admin..."
     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=${WP_DB_HOST} --allow-root;
 	echo "Wordpress: installation...";
     wp core install --url=apommier.42.fr --title=CoUcoU --admin_user=admin --admin_password=admin --admin_email=admin@42.fr --skip-email --allow-root;
     echo "Wordpress: create user...";
-    #wp user create --allow-root ${WP_USER_LOGIN} ${WP_USER_EMAIL} --user_pass=${WP_USER_PASSWORD};
     wp user create apommier apommier@student.42.fr --user_pass=1234 --allow-root;
-	#sudo -u ${USER} -i -- wp user create ${WP_USER_LOGIN} apommier@student.42.fr --user_pass=${WP_USER_PASSWORD};
     echo "Wordpress: set up!"
 fi