diff --git a/Makefile b/Makefile index 43e5fc9..5f74b77 100644 --- a/Makefile +++ b/Makefile @@ -10,3 +10,24 @@ # # # **************************************************************************** # +all: + docker-compose -f ./srcs/docker-compose.yml up --build + +fclean: down + -rm -rf ./srcs/wordpress + -docker rm $$(docker ps -qa) + -docker rmi -f $$(docker images -qa) + -docker volume rm $$(docker volume ls -q) + -docker network rm $$(docker network ls -q) +up: + docker-compose -f ./srcs/docker-compose.yml up + +back: + docker-compose -f ./srcs/docker-compose.yml up --build -d + +down: + docker-compose -f ./srcs/docker-compose.yml down + +re: clean + docker-compose -f ./srcs/docker-compose.yml build --no-cache + docker-compose -f ./srcs/docker-compose.yml up \ No newline at end of file diff --git a/srcs/.env b/srcs/.env index c0061a4..08b614d 100644 --- a/srcs/.env +++ b/srcs/.env @@ -13,3 +13,6 @@ WP_USER_EMAIL=apommier@student.42.fr MARIADB_DATABASE=wordpress MARIADB_USER=apommier MARIADB_PASSWORD=1234 + +CERT_PATH=/etc/ssl/certs/nginx-selfsigned.crt +KEY_PATH=/etc/ssl/private/nginx-selfsigned.key diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 68eae0f..e4810ff 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -45,4 +45,4 @@ networks: driver: bridge volumes: - wpfiles: \ No newline at end of file + wp_data: \ No newline at end of file diff --git a/srcs/requirements/nginx/conf/nginx.conf b/srcs/requirements/nginx/conf/nginx.conf index 1b89f32..f4a298c 100644 --- a/srcs/requirements/nginx/conf/nginx.conf +++ b/srcs/requirements/nginx/conf/nginx.conf @@ -6,7 +6,7 @@ server { ssl_protocols TLSv1.3; ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt; - ssl_certificate_key //etc/ssl/private/nginx-selfsigned.key; + ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key; index index.php;