diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile index 81bbc62..1ff8669 100644 --- a/srcs/requirements/mariadb/Dockerfile +++ b/srcs/requirements/mariadb/Dockerfile @@ -19,15 +19,4 @@ RUN mkdir /mysql_scripts COPY ./tools/ /mysql_scripts/ EXPOSE 3306 -ENTRYPOINT ["bash", "mysql_scripts/sqlStart.sh"] -#RUN service mysql start && mysql < /mysql_scripts/mySqlScript.sql - - - -#CMD ["service", "mysql", "start", "&&","mysqld"] -#CMD ["mysqld"] -#CMD ["mysqld", "--bind-address=0.0.0.0"] - -#CMD ["bash", "mysql_scripts/sqlStart.sh"] -#ENTRYPOINT ["mysqld"] - +ENTRYPOINT ["bash", "mysql_scripts/sqlStart.sh"] \ No newline at end of file diff --git a/srcs/requirements/mariadb/tools/mySqlScript.sql b/srcs/requirements/mariadb/tools/mySqlScript.sql deleted file mode 100644 index 8e73cd0..0000000 --- a/srcs/requirements/mariadb/tools/mySqlScript.sql +++ /dev/null @@ -1,4 +0,0 @@ -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; \ No newline at end of file diff --git a/srcs/requirements/mariadb/tools/sqlStart.sh b/srcs/requirements/mariadb/tools/sqlStart.sh index 4ebc83c..c58b20d 100644 --- a/srcs/requirements/mariadb/tools/sqlStart.sh +++ b/srcs/requirements/mariadb/tools/sqlStart.sh @@ -1,6 +1,16 @@ -#!/bin/bash +# **************************************************************************** # +# # +# ::: :::::::: # +# sqlStart.sh :+: :+: :+: # +# +:+ +:+ +:+ # +# By: apommier +#+ +:+ +#+ # +# +#+#+#+#+#+ +#+ # +# Created: 2022/10/08 11:59:11 by apommier #+# #+# # +# Updated: 2022/10/08 11:59:12 by apommier ### ########.fr # +# # +# **************************************************************************** # + service mysql start -#service mysql start && mysql < /mysql_scripts/mySqlScript.sql mysql << EOF @@ -10,10 +20,6 @@ GRANT ALL PRIVILEGES ON *.* TO '${MARIADB_USER}'@'%'; FLUSH PRIVILEGES; EOF -#mysqld --datadir='/home/mariadb' service mysql stop mysqld -#/etc/init.d/mysql stop - -#exec "$@" diff --git a/srcs/requirements/wordpress/tools/start.sh b/srcs/requirements/wordpress/tools/start.sh index f357a1e..be3dfbc 100644 --- a/srcs/requirements/wordpress/tools/start.sh +++ b/srcs/requirements/wordpress/tools/start.sh @@ -1,3 +1,15 @@ +# **************************************************************************** # +# # +# ::: :::::::: # +# start.sh :+: :+: :+: # +# +:+ +:+ +:+ # +# By: apommier +#+ +:+ +#+ # +# +#+#+#+#+#+ +#+ # +# Created: 2022/10/08 11:59:05 by apommier #+# #+# # +# Updated: 2022/10/08 11:59:06 by apommier ### ########.fr # +# # +# **************************************************************************** # + #!/bin/bash sleep 5 @@ -17,7 +29,6 @@ then wp core download --locale=fr_FR --allow-root; echo "Wordpress: configuration..." 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..."; diff --git a/srcs/requirements/wordpress/tools/wp-config.php b/srcs/requirements/wordpress/tools/wp-config.php deleted file mode 100644 index 14e731e..0000000 --- a/srcs/requirements/wordpress/tools/wp-config.php +++ /dev/null @@ -1,98 +0,0 @@ -_=r2;(P}<-Qi ZnAL%G3n CQWA' ); -define( 'SECURE_AUTH_KEY', 'T+2K-V&%Nb0+lvfRvom)BMt&aNXM:G`3!y>HwXk*tf=j:cR5!fccpWxAv5b&v`Qe' ); -define( 'LOGGED_IN_KEY', '3FV[c{H<[z<~d=m{-;5#g&5iZk{,Ceke76tc%CTGbksQvT),i=PoVz}bet;(dD+5' ); -define( 'NONCE_KEY', 'G>:_Ja?N<5ySFU?,g=[7?k~&tf)sFqElCa~Og.mpYhK* =eD4l6cLBa7O)m.yN)#' ); -define( 'AUTH_SALT', 'O,[H`{.h 6<~YG XUkw}&B6>/o]}<@9I apmJ PQ(%WsTI>jWvKPAUS`m4hdxy`Q$2kC3ZSLMrdFm^(W*xeG=lg/Xe%GKaIdX&' ); -define( 'LOGGED_IN_SALT', '2!0~FjHbN9&*7)-hzL$l~xQ6alaEm|1T0e2A9 71LsUF(kc&Cx