From 41c549357998a50e4e37db237e48a86adfacc24e Mon Sep 17 00:00:00 2001 From: kinou-p Date: Sat, 24 Sep 2022 02:08:32 +0200 Subject: [PATCH] clean3 - no makefile --- srcs/requirements/mariadb/Dockerfile | 1 - srcs/requirements/nginx/conf/nginx.conf | 2 +- srcs/requirements/wordpress/Dockerfile | 2 +- srcs/requirements/wordpress/tools/start.sh | 16 ++++++++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile index 0378ef4..a901dc4 100644 --- a/srcs/requirements/mariadb/Dockerfile +++ b/srcs/requirements/mariadb/Dockerfile @@ -16,7 +16,6 @@ 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/ -#COPY ./conf/server.conf /etc/mysql/mariadb.conf.d/ RUN service mysql start && mysql < /mysql_scripts/mySqlScript.sql diff --git a/srcs/requirements/nginx/conf/nginx.conf b/srcs/requirements/nginx/conf/nginx.conf index e05c691..1b89f32 100644 --- a/srcs/requirements/nginx/conf/nginx.conf +++ b/srcs/requirements/nginx/conf/nginx.conf @@ -1,6 +1,6 @@ server { listen 443 ssl; - listen 80; + listen 80 ssl; server_name apommier.42.fr; diff --git a/srcs/requirements/wordpress/Dockerfile b/srcs/requirements/wordpress/Dockerfile index e7071b5..4073f92 100644 --- a/srcs/requirements/wordpress/Dockerfile +++ b/srcs/requirements/wordpress/Dockerfile @@ -13,7 +13,7 @@ FROM debian:buster RUN apt-get update -RUN apt-get -y install php7.3 php-mysqli php-fpm wget sendmail sudo +RUN apt-get -y install php7.3 php-mysqli php-fpm wget EXPOSE 9000 diff --git a/srcs/requirements/wordpress/tools/start.sh b/srcs/requirements/wordpress/tools/start.sh index b263103..04dd9da 100644 --- a/srcs/requirements/wordpress/tools/start.sh +++ b/srcs/requirements/wordpress/tools/start.sh @@ -4,12 +4,13 @@ mkdir -p /run/php/; touch /run/php/php7.3-fpm.pid; -if [ ! -f /var/www/html/wp-config.php ]; then +if [ ! -f /var/www/html/wp-config.php ] +then echo "Wordpress: setting up..." - mkdir -p /var/www/html wget 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; + mkdir -p /var/www/html cd /var/www/html; echo "Wordpress: downloading..." wp core download --locale=fr_FR --allow-root; @@ -20,6 +21,17 @@ if [ ! -f /var/www/html/wp-config.php ]; then echo "Wordpress: create user..."; wp user create apommier apommier@student.42.fr --user_pass=1234 --allow-root; echo "Wordpress: set up!" +else + echo "Wordpress: setting up..." + wget 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; + cd /var/www/html; + 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 apommier apommier@student.42.fr --user_pass=1234 --allow-root; + echo "Wordpress: set up!" fi exec "$@" \ No newline at end of file