er

Makefile

@@ -1,15 +1,11 @@
-NAME=inception
+all:
-SRC_DIR=srcs
+	mkdir -p /home/yantoine/data/db
-
+	mkdir -p /home/yantoine/data/wp
-up:
+	docker-compose -f srcs/docker-compose.yml up --build -d
-	docker compose -f $(SRC_DIR)/docker-compose.yml --env-file $(SRC_DIR)/.env up -d --build
 
 down:
-	docker compose -f $(SRC_DIR)/docker-compose.yml down
+	docker-compose -f srcs/docker-compose.yml down
 
-re: down up
+re: down all
 
-fclean: down
+.PHONY: all down re
-	docker system prune -af
-
-.PHONY: up down re fclean

secrets/README.txt

@@ -1,7 +0,0 @@
-
-- db_password.txt           : mot de passe de l'utilisateur MySQL
-- db_root_password.txt      : mot de passe root MySQL
-- tls_crt.pem               : certificat TLS (full chain)
-- tls_key.pem               : clé privée TLS
-
- .gitignore !

secrets/db_password.txt

@@ -1 +0,0 @@
-motdepasseuser

secrets/db_root_password.txt

@@ -1 +0,0 @@
-motdepasseroot

secrets/tls_crt.pem

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDjzCCAnegAwIBAgIUTJCx7vaFiojCcjWzv038pPBJ0JQwDQYJKoZIhvcNAQEL
-BQAwVzELMAkGA1UEBhMCRlIxCzAJBgNVBAgMAjQyMQ4wDAYDVQQHDAVQYXJpczES
-MBAGA1UECgwJSW5jZXB0aW9uMRcwFQYDVQQDDA55YW50b2luZS40Mi5mcjAeFw0y
-NTA3MDcyMzA2NThaFw0yNjA3MDcyMzA2NThaMFcxCzAJBgNVBAYTAkZSMQswCQYD
-VQQIDAI0MjEOMAwGA1UEBwwFUGFyaXMxEjAQBgNVBAoMCUluY2VwdGlvbjEXMBUG
-A1UEAwwOeWFudG9pbmUuNDIuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDIin6td4TI/XquOuGwsSCMsk8vDjBwnyJXuLMnEXlwywcMgUrK6f0niaAG
-XnFrDDJ7n6515HtmniXyJsK/sPVMJoBP9uHYau2amemZhRsFDarsyxnlfYmsc2Ax
-MJxNqnh/9jtR2HxIW0MdvdgvfYNrvyFfKOJ1MypYt60d5OXDnzRetokm7uXsFqpp
-gz517nj3YD1lPh+1cIYR5HiPywAd5IB+lOGvw53YDAb9VmU03xvmvKuZHuYQmJVv
-VBHV5LwGVoduyP8DGK36Nh9RlNAxEUSWIIaExnKXUm9c948a/OsuHCB4ks0dT209
-fQbnxU5mqvo+/wNROdA9vAepv2lNAgMBAAGjUzBRMB0GA1UdDgQWBBTTnH14HI/x
-1M3wFMcF7GAdlnpssjAfBgNVHSMEGDAWgBTTnH14HI/x1M3wFMcF7GAdlnpssjAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB2NcfiWNcPtWUW8zow
-6aD8SQzz4FMMrTAwJG/QYrd+1J75DEM/reT1UivkfX19rsbHp+YjNY9duFBfO7aX
-cz5zajof0GS69LI13tOI2GUayG8D2HacBY+BSOybI7l0uuI90i8xBwkc/m2lZdOW
-wMtDP4jBAtr38HevQhimLzQdLRoqTqku6Dz13f8tPGkCTNCfSbmHYSclpFhXIl0/
-KsVM6rW107TsVh4Tukpumb9mrUsWW2KBdeD/uNF0qtnpgt31fhGjOco/eEojOrpn
-v08CjnyNl+v3cz/TzK08g1gsspJtVxv9IRI9t3673Z+yjLVPqYy8e2thPcu0Tbmi
-iIw0
------END CERTIFICATE-----

secrets/tls_key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDIin6td4TI/Xqu
-OuGwsSCMsk8vDjBwnyJXuLMnEXlwywcMgUrK6f0niaAGXnFrDDJ7n6515HtmniXy
-JsK/sPVMJoBP9uHYau2amemZhRsFDarsyxnlfYmsc2AxMJxNqnh/9jtR2HxIW0Md
-vdgvfYNrvyFfKOJ1MypYt60d5OXDnzRetokm7uXsFqppgz517nj3YD1lPh+1cIYR
-5HiPywAd5IB+lOGvw53YDAb9VmU03xvmvKuZHuYQmJVvVBHV5LwGVoduyP8DGK36
-Nh9RlNAxEUSWIIaExnKXUm9c948a/OsuHCB4ks0dT209fQbnxU5mqvo+/wNROdA9
-vAepv2lNAgMBAAECggEAA4wI4+Tmc9mhPF4ClOn6cz1KJOvBfpR0pTbj8E/LpUDq
-DdYRmReHaJYeFE7CVHbhmQnWKklRchtfp3H5EC6UlXVkNUXexmxUad90Csjtv+qh
-zdC6fgfOPL8eV0W5VgRVtPRe0I/y2XgdGUm806Y1ggfePWfPOEHLQMjK5pRLCL6K
-6d1Mn4AaaXOpgnJDPPltwzkl0Z9t+zEbIVmCG6isHRAP+LKug6a75dejTLkMQmY8
-kAUkKOHTneVYj+vIHYCQPiH6wsgQ8frBuxd1zD35xOMA4scC2+NUHZKB329FcIdo
-gJ4uuNYC+4mChDVB2hZXM24eYo+aLw7V/Nxe8fQDrwKBgQD5pb80lvN8GGHVBkNR
-IdwGd9Cx9pcUemwyJjOmL/RN35P2wiR0g0AErdEiQB+uA9l//w6+Isdw8Nl1xnga
-eW4dFZDBnIAFucNlBjWjJeCattozj4J+l4iDQtZ4G5X43f19Xc6Ij1D/T2Uv6hE+
-BFSCI97cxjNX+CamxNHiBmroiwKBgQDNpNvWZFCIcGswbUZmvh2x6/rw9nTHJUfo
-7fE1WeMwCcmXl497fgafxgfYn4sVZRsv2n5xOtzjDq0F+3RFHFdRFcCbNrLk4nvQ
-OCo/8eRHGh9pj5DlrkI9mxd98ulTcGDtM1l7H4i8fmlKA2nbgsbm4xAHrbp2dMl2
-UiZx1S1YhwKBgFgOCl82TzOaNge5ac0YME9nu4jJ/YgPllIp/1XC3F0LW1lSKSGf
-mdkMphN6orHyUalAAac3BTnk+g78rihIZHqFvMVNuipK14yuoASnu41Wqag+Gj0k
-ndYOoS9EK6XYRy0NBWhNhLhI/Nvlp6dER7qPhHBCyKFiud9g1NbwhIz5AoGAdBfr
-277KEByXBsHKCtqtXPKBumMIThzn2cHqeFoEfewomKIBaJAfITfk2hBHro5jqMJK
-u5WlebGhUE1CuHlleeszzuw0Vi7eAxCSGYNvggxnS2q3PFMCJlFWE858lpRMw9xH
-WdDVmsQqoJQIwNm1fEcXl54mNBV+XoPGHGFitiUCgYBq3NwWC4X5whD9nQsD9Ktg
-3fZd9fc/QsdVDN58zh/Pmn8mMjQd5V3c/CNRrJ1uPAY9OyLWlClS/c5KEpNr8k0F
-VJ40lhiHCv6T7DuzU2Ni0K5YHzMcVAc8lXxJz6v+T4RGqqmNXH8bMcZYd+zRna/u
-rGkuwgA+oFWgIyPCfE5bGA==
------END PRIVATE KEY-----

srcs/.env

@@ -0,0 +1,5 @@
+DOMAIN_NAME=yantoine.42.fr
+MYSQL_USER=yantoine
+MYSQL_PASSWORD=password
+MYSQL_DATABASE=wordpress
+MYSQL_ROOT_PASSWORD=rootpassword

srcs/.env.example

@@ -1,17 +0,0 @@
-LOGIN=yantoine
-DOMAIN_NAME=yantoine.42.fr
-
-# Chemin hôte où seront stockés les volumes
-HOST_PATH=/home/${LOGIN}/data
-
-# Base de données
-MYSQL_DATABASE=wordpress
-MYSQL_USER=simple_user
-# Les fichiers secrets contiendront les mots de passe
-# MYSQL_PASSWORD et MYSQL_ROOT_PASSWORD sont fournis via des secrets Docker
-
-# WordPress
-WP_ADMIN_USER=root
-WP_ADMIN_PASSWORD=supertoor123
-WP_ADMIN_EMAIL=root@mail.com
-WP_TITLE=Inception42

srcs/docker-compose.yml

@@ -1,86 +1,42 @@
-version: "3.8"
+version: '3'
 
 services:
-  nginx:
+  mariadb:
-    build: ./requirements/nginx
+    build: ./requirements/mariadb
-    container_name: nginx
+    container_name: mariadb
-    image: nginx
+    restart: always
-    depends_on:
-      - wordpress
     volumes:
-      - wp_data:/var/www/html
+      - db:/var/lib/mysql
+    env_file: .env
     networks:
       - inception
-    ports:
-      - "443:443"
-    restart: always
-    environment:
-      - DOMAIN_NAME=${DOMAIN_NAME}
-    secrets:
-      - tls_crt
-      - tls_key
 
   wordpress:
     build: ./requirements/wordpress
     container_name: wordpress
-    image: wordpress
+    restart: always
+    volumes:
+      - wp:/var/www/html
+    env_file: .env
     depends_on:
       - mariadb
-    volumes:
-      - wp_data:/var/www/html
     networks:
       - inception
-    restart: always
-    environment:
-      - WORDPRESS_DB_HOST=mariadb:3306
-      - WORDPRESS_DB_NAME=${MYSQL_DATABASE}
-      - WORDPRESS_DB_USER=${MYSQL_USER}
-      - WORDPRESS_DB_PASSWORD_FILE=/run/secrets/db_password
-      - DOMAIN_NAME=${DOMAIN_NAME}
-    secrets:
-      - db_password
 
-  mariadb:
+  nginx:
-    build: ./requirements/mariadb
+    build: ./requirements/nginx
-    container_name: mariadb
+    container_name: nginx
-    image: mariadb
+    restart: always
-    volumes:
+    ports:
-      - db_data:/var/lib/mysql
+      - "443:443"
+    depends_on:
+      - wordpress
     networks:
       - inception
-    restart: always
-    environment:
-      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
-    secrets:
-      - db_root_password
-      - db_password
 
 volumes:
-  db_data:
+  db:
-    driver: local
+  wp:
-    driver_opts:
-      type: none
-      device: ${HOST_PATH}/db
-      o: bind
-  wp_data:
-    driver: local
-    driver_opts:
-      type: none
-      device: ${HOST_PATH}/wp
-      o: bind
 
 networks:
   inception:
-
-secrets:
-  db_password:
-    file: ../secrets/db_password.txt
-  db_root_password:
-    file: ../secrets/db_root_password.txt
-  tls_key:
-    file: ../secrets/tls_key.pem
-  tls_crt:
-    file: ../secrets/tls_crt.pem

srcs/requirements/mariadb/Dockerfile

@@ -1,12 +1,12 @@
-FROM alpine:3.20
+FROM debian:12.5-slim
 
-RUN apk update && \
+RUN apt-get update && apt-get install -y mariadb-server && rm -rf /var/lib/apt/lists/*
-    apk add --no-cache mariadb mariadb-client bash && \
+RUN mkdir -p /run/mysqld && chown -R mysql:mysql /var/lib/mysql /run/mysqld
-    mkdir -p /run/mysqld && chown -R mysql:mysql /run/mysqld /var/lib/mysql
 
-# Copie du script d'initialisation
+COPY tools/init.sh /docker-entrypoint-initdb.d/init.sh
-COPY tools/init-db.sh /docker-entrypoint-initdb.d/init-db.sh
+RUN chmod +x /docker-entrypoint-initdb.d/init.sh
-RUN chmod +x /docker-entrypoint-initdb.d/init-db.sh
 
+USER mysql
 EXPOSE 3306
+
 CMD ["mysqld"]

srcs/requirements/mariadb/tools/init-db.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-set -eu
-
-echo "Initialisation de la base de données…"
-
-# Création de la base et de l'utilisateur
-cat <<-EOSQL > /tmp/init.sql
-CREATE DATABASE IF NOT EXISTS \`${MYSQL_DATABASE}\`;
-CREATE USER IF NOT EXISTS '\${MYSQL_USER}'@'%' IDENTIFIED BY '\$(cat /run/secrets/db_password)';
-GRANT ALL PRIVILEGES ON \`${MYSQL_DATABASE}\`.* TO '\${MYSQL_USER}'@'%';
-FLUSH PRIVILEGES;
-EOSQL
-
-mysql -u root -p"$(cat /run/secrets/db_root_password)" < /tmp/init.sql
-rm /tmp/init.sql

srcs/requirements/mariadb/tools/init.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+mysql_install_db --user=mysql --ldata=/var/lib/mysql
+mysqld --user=mysql --bootstrap << EOF
+FLUSH PRIVILEGES;
+ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}';
+CREATE DATABASE IF NOT EXISTS ${MYSQL_DATABASE};
+CREATE USER '${MYSQL_USER}'@'%' IDENTIFIED BY '${MYSQL_PASSWORD}';
+GRANT ALL PRIVILEGES ON ${MYSQL_DATABASE}.* TO '${MYSQL_USER}'@'%';
+FLUSH PRIVILEGES;
+EOF

srcs/requirements/nginx/.dockerignore

@@ -1,2 +0,0 @@
-*.pem
-*.crt

srcs/requirements/nginx/Dockerfile

@@ -1,13 +1,13 @@
-FROM alpine:3.20
+FROM debian:12.5-slim
 
-RUN apk update && apk add --no-cache nginx openssl bash
+RUN apt-get update && apt-get install -y nginx openssl && rm -rf /var/lib/apt/lists/*
 
-# Copie des fichiers de configuration
+RUN mkdir /etc/ssl/certs /etc/ssl/private
-COPY conf/nginx.conf /etc/nginx/nginx.conf
+COPY tools/mkcert.sh /tmp/mkcert.sh
-COPY conf/default.conf /etc/nginx/http.d/default.conf
+RUN chmod +x /tmp/mkcert.sh && /tmp/mkcert.sh
-COPY tools/entrypoint.sh /entrypoint.sh
+
-RUN chmod +x /entrypoint.sh
+COPY conf/default.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 443
 
-ENTRYPOINT ["/entrypoint.sh"]
+CMD ["nginx", "-g", "daemon off;"]

srcs/requirements/nginx/conf/default.conf

@@ -1,23 +1,18 @@
 server {
     listen 443 ssl http2;
-    server_name __DOMAIN_NAME__;
+    server_name yantoine.42.fr;
+
+    ssl_certificate     /etc/ssl/certs/server.pem;
+    ssl_certificate_key /etc/ssl/private/tls.key;
 
-    ssl_certificate     /etc/ssl/certs/server.crt;
-    ssl_certificate_key /etc/ssl/private/server.key;
     ssl_protocols       TLSv1.2 TLSv1.3;
-    ssl_prefer_server_ciphers off;
+    ssl_ciphers         HIGH:!aNULL:!MD5;
-
-    root /var/www/html;
-    index index.php index.html;
 
     location / {
-        try_files $uri $uri/ /index.php?$args;
+        proxy_pass http://wordpress:9000;
-    }
+        proxy_set_header Host $host;
-
+        proxy_set_header X-Real-IP $remote_addr;
-    location ~ \.php$ {
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        include fastcgi_params;
+        proxy_set_header X-Forwarded-Proto $scheme;
-        fastcgi_pass wordpress:9000;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_param PATH_INFO $fastcgi_path_info;
     }
 }

srcs/requirements/nginx/conf/nginx.conf

@@ -1,21 +0,0 @@
-user nginx;
-worker_processes auto;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    keepalive_timeout  65;
-
-    include /etc/nginx/http.d/*.conf;
-}

srcs/requirements/nginx/tools/entrypoint.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-set -eu
-
-# Copie des secrets TLS vers leurs emplacements
-cp /run/secrets/tls_crt /etc/ssl/certs/server.crt
-cp /run/secrets/tls_key /etc/ssl/private/server.key
-chmod 600 /etc/ssl/private/server.key
-
-# Remplacement du nom de domaine dans la conf
-sed -i "s/__DOMAIN_NAME__/${DOMAIN_NAME}/g" /etc/nginx/http.d/default.conf
-
-exec nginx -g 'daemon off;'

srcs/requirements/nginx/tools/mkcert.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+openssl req -x509 -nodes -days 365     -newkey rsa:2048     -keyout /etc/ssl/private/tls.key     -out /etc/ssl/certs/server.pem     -subj "/C=FR/ST=France/L=Paris/O=42/CN=yantoine.42.fr"

srcs/requirements/wordpress/Dockerfile

@@ -1,22 +1,10 @@
-FROM alpine:3.20
+FROM debian:12.5-slim
 
-RUN apk update && \
+RUN apt-get update && apt-get install -y php-fpm php-mysql curl && rm -rf /var/lib/apt/lists/*
-    apk add --no-cache php82 php82-fpm php82-mysqli php82-json php82-session php82-phar \
-        php82-xml php82-mbstring php82-gd php82-curl php82-dom wget bash && \
-    adduser -D -g 'www' www
 
-WORKDIR /var/www/html
+COPY tools/setup.sh /setup.sh
+RUN chmod +x /setup.sh && /setup.sh
 
-# Téléchargement de WordPress
-RUN wget https://wordpress.org/latest.tar.gz && \
-    tar -xzf latest.tar.gz --strip-components=1 && \
-    rm latest.tar.gz
-
-COPY tools/entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh && \
-    chown -R www:www /var/www/html && \
-    sed -i 's|listen = .*|listen = 0.0.0.0:9000|' /etc/php82/php-fpm.d/www.conf
-
-USER www
 EXPOSE 9000
-ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["php-fpm8.2", "-F"]

srcs/requirements/wordpress/tools/entrypoint.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-set -eu
-
-CONFIG=/var/www/html/wp-config.php
-
-if [ ! -f "$CONFIG" ]; then
-    cp wp-config-sample.php $CONFIG
-    sed -i "s/database_name_here/${WORDPRESS_DB_NAME}/" $CONFIG
-    sed -i "s/username_here/${WORDPRESS_DB_USER}/" $CONFIG
-    sed -i "s/password_here/$(cat ${WORDPRESS_DB_PASSWORD_FILE})/" $CONFIG
-    sed -i "s/localhost/${WORDPRESS_DB_HOST}/" $CONFIG
-fi
-
-# Lancement de php-fpm au premier plan
-php-fpm --nodaemonize

srcs/requirements/wordpress/tools/setup.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+curl -LO https://wordpress.org/latest.tar.gz
+tar -xzvf latest.tar.gz --strip-components=1 -C /var/www/html
+rm latest.tar.gz
+chown -R www-data:www-data /var/www/html