From 3af8c81dc4cd6202f444caa15828aa6395a280d3 Mon Sep 17 00:00:00 2001 From: kinou-p Date: Sat, 8 Oct 2022 12:41:31 +0200 Subject: [PATCH] done --- Makefile | 10 +++++----- srcs/.env | 4 ++-- srcs/docker-compose.yml | 4 ++-- srcs/requirements/mariadb/tools/sqlStart.sh | 13 ++----------- srcs/requirements/wordpress/tools/start.sh | 12 ------------ 5 files changed, 11 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index c0d2ede..cfec95e 100644 --- a/Makefile +++ b/Makefile @@ -6,18 +6,18 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/08/12 01:38:24 by apommier #+# #+# # -# Updated: 2022/08/12 01:38:25 by apommier ### ########.fr # +# Updated: 2022/10/08 12:29:48 by apommier ### ########.fr # # # # **************************************************************************** # all: - -mkdir /home/apommier/wordpress - -mkdir /home/apommier/mariadb + -mkdir -p /home/apommier/data/wordpress + -mkdir -p /home/apommier/data/mariadb docker-compose -f ./srcs/docker-compose.yml up --build fclean: down - -sudo rm -rf /home/apommier/wordpress - -sudo rm -rf /home/apommier/mariadb + -sudo rm -rf /home/apommier/data/wordpress + -sudo rm -rf /home/apommier/data/mariadb -docker rm $$(docker ps -qa) -docker rmi -f $$(docker images -qa) -docker volume rm $$(docker volume ls -q) diff --git a/srcs/.env b/srcs/.env index 4d56308..8b8ddb4 100644 --- a/srcs/.env +++ b/srcs/.env @@ -2,8 +2,8 @@ WP_URL=apommier.42.fr WP_TITLE=wordpress WORDPRESS_DB_HOST=mariadb -WP_ADMIN_LOGIN=admin -WP_ADMIN_PASSWORD=admin +WP_ADMIN_LOGIN=Super +WP_ADMIN_PASSWORD=1234 WP_ADMIN_EMAIL=admin@42.fr WP_USER_LOGIN=apommier diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 66195aa..343beb7 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -52,10 +52,10 @@ volumes: driver_opts: type: none o: 'bind' - device: '/home/apommier/wordpress' + device: '/home/apommier/data/wordpress' dbdata: driver: local driver_opts: type: none o: 'bind' - device: '/home/apommier/mariadb' \ No newline at end of file + device: '/home/apommier/data/mariadb' \ No newline at end of file diff --git a/srcs/requirements/mariadb/tools/sqlStart.sh b/srcs/requirements/mariadb/tools/sqlStart.sh index c58b20d..5b5fb64 100644 --- a/srcs/requirements/mariadb/tools/sqlStart.sh +++ b/srcs/requirements/mariadb/tools/sqlStart.sh @@ -1,14 +1,4 @@ -# **************************************************************************** # -# # -# ::: :::::::: # -# sqlStart.sh :+: :+: :+: # -# +:+ +:+ +:+ # -# By: apommier +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2022/10/08 11:59:11 by apommier #+# #+# # -# Updated: 2022/10/08 11:59:12 by apommier ### ########.fr # -# # -# **************************************************************************** # +#!/bin/bash service mysql start @@ -17,6 +7,7 @@ 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}'@'%'; +SET PASSWORD FOR 'root'@'localhost' = PASSWORD('$MARIADB_ROOT_PASSWORD'); FLUSH PRIVILEGES; EOF diff --git a/srcs/requirements/wordpress/tools/start.sh b/srcs/requirements/wordpress/tools/start.sh index be3dfbc..f532a51 100644 --- a/srcs/requirements/wordpress/tools/start.sh +++ b/srcs/requirements/wordpress/tools/start.sh @@ -1,15 +1,3 @@ -# **************************************************************************** # -# # -# ::: :::::::: # -# 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