diff --git a/Makefile b/Makefile index 4ed572b..a71c440 100644 --- a/Makefile +++ b/Makefile @@ -8,4 +8,9 @@ down: re: down all -.PHONY: all down re +prune: + docker system prune -a --volumes + rm -rf /home/yantoine/data/db + rm -rf /home/yantoine/data/wp + +.PHONY: all down re prune diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 13d1867..0d56435 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -33,6 +33,8 @@ services: - wordpress networks: - inception + volumes: + - wp:/var/www/html volumes: db: diff --git a/srcs/requirements/nginx/Dockerfile b/srcs/requirements/nginx/Dockerfile index 955d65f..362703c 100644 --- a/srcs/requirements/nginx/Dockerfile +++ b/srcs/requirements/nginx/Dockerfile @@ -2,7 +2,7 @@ FROM debian:12.5-slim RUN apt-get update && apt-get install -y nginx openssl && rm -rf /var/lib/apt/lists/* -RUN mkdir /etc/ssl/certs /etc/ssl/private +RUN mkdir -p /etc/ssl/certs /etc/ssl/private COPY tools/mkcert.sh /tmp/mkcert.sh RUN chmod +x /tmp/mkcert.sh && /tmp/mkcert.sh diff --git a/srcs/requirements/nginx/conf/default.conf b/srcs/requirements/nginx/conf/default.conf index c4a5a1b..f844db9 100644 --- a/srcs/requirements/nginx/conf/default.conf +++ b/srcs/requirements/nginx/conf/default.conf @@ -9,10 +9,14 @@ server { ssl_ciphers HIGH:!aNULL:!MD5; location / { - proxy_pass http://wordpress:9000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + root /var/www/html; + index index.php index.html; + + location ~ \.php$ { + include fastcgi_params; + fastcgi_pass wordpress:9000; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } } + } diff --git a/srcs/requirements/wordpress/Dockerfile b/srcs/requirements/wordpress/Dockerfile index 0ac2a9c..29cbf13 100644 --- a/srcs/requirements/wordpress/Dockerfile +++ b/srcs/requirements/wordpress/Dockerfile @@ -2,9 +2,16 @@ FROM debian:12.5-slim RUN apt-get update && apt-get install -y php-fpm php-mysql curl && rm -rf /var/lib/apt/lists/* +# Force PHP-FPM à écouter sur le port TCP 9000 +RUN sed -i 's/listen = \/run\/php\/php8.2-fpm.sock/listen = 0.0.0.0:9000/' /etc/php/8.2/fpm/pool.d/www.conf + +# Créer le dossier AVANT de lancer le script +RUN mkdir -p /var/www/html + COPY tools/setup.sh /setup.sh RUN chmod +x /setup.sh && /setup.sh EXPOSE 9000 CMD ["php-fpm8.2", "-F"] +