diff --git a/srcs/.env b/srcs/.env index 8b8ddb4..cbc7c13 100644 --- a/srcs/.env +++ b/srcs/.env @@ -13,4 +13,3 @@ WP_USER_EMAIL=apommier@student.42.fr MARIADB_DATABASE=wordpress MARIADB_USER=apommier MARIADB_PASSWORD=1234 -MARIADB_ROOT_PASSWORD=1234 diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile index da5657f..2449ca3 100644 --- a/srcs/requirements/mariadb/Dockerfile +++ b/srcs/requirements/mariadb/Dockerfile @@ -14,10 +14,7 @@ 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 -WORKDIR /mysql_scripts -ENTRYPOINT ["bash", "sqlStart.sh"] -#ENTRYPOINT ["bash", "work.sh"] \ No newline at end of file +COPY ./tools/setup.sql / +RUN service mysql start && mysql < setup.sql +CMD ["/usr/bin/mysqld_safe"] \ No newline at end of file diff --git a/srcs/requirements/mariadb/tools/db.sh b/srcs/requirements/mariadb/tools/db.sh deleted file mode 100644 index f82d2c1..0000000 --- a/srcs/requirements/mariadb/tools/db.sh +++ /dev/null @@ -1,4 +0,0 @@ -CREATE DATABASE IF NOT EXISTS wordpress; -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/pwd.sh b/srcs/requirements/mariadb/tools/pwd.sh deleted file mode 100644 index 1e477ac..0000000 --- a/srcs/requirements/mariadb/tools/pwd.sh +++ /dev/null @@ -1 +0,0 @@ -SET PASSWORD FOR 'root'@'localhost' = PASSWORD('$MARIADB_ROOT_PASSWORD'); \ No newline at end of file diff --git a/srcs/requirements/mariadb/tools/setup.sql b/srcs/requirements/mariadb/tools/setup.sql new file mode 100644 index 0000000..3c86082 --- /dev/null +++ b/srcs/requirements/mariadb/tools/setup.sql @@ -0,0 +1,6 @@ +DROP DATABASE IF EXISTS test; +CREATE DATABASE IF NOT EXISTS wordpress; +CREATE USER IF NOT EXISTS 'apommier'@'%' IDENTIFIED BY '1234'; +GRANT ALL PRIVILEGES ON *.* TO 'apommier'@'%'; +SET PASSWORD FOR 'root'@'localhost' = PASSWORD('1234'); +FLUSH PRIVILEGES; \ No newline at end of file diff --git a/srcs/requirements/mariadb/tools/sqlStart.sh b/srcs/requirements/mariadb/tools/sqlStart.sh deleted file mode 100644 index 8dcb764..0000000 --- a/srcs/requirements/mariadb/tools/sqlStart.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -echo "----mysql start----" -service mysql start -echo "----mysql start done----" -if [ ! -d /var/lib/mysql/wordpress ] -then - -echo "----sql config----" - -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}'@'%'; -FLUSH PRIVILEGES; -EOF -mysql -u root < pwd.sh -echo "----sql config done----" - - -fi -echo "----mysql restart----" -service mysql stop -echo "----mysql stop done----" -mysqld -#mysqld -u root -p${MARIADB_PASSWORD}