From 54325fb73bb5f976f39891c11f645d1f8f132e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A8ve=20Caillault?= Date: Sun, 22 Feb 2026 10:31:31 +0100 Subject: [PATCH] =?UTF-8?q?Utilisation=20d'un=20fichier=20docker-compose?= =?UTF-8?q?=20s=C3=A9par=C3=A9=20pour=20la=20configuration=20d'Apache.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.apache-php.yml | 13 +++++++++++++ docker-compose.lets-encrypt.yml | 4 ++-- docker-compose.yml | 22 ++++++---------------- 3 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 docker-compose.apache-php.yml diff --git a/docker-compose.apache-php.yml b/docker-compose.apache-php.yml new file mode 100644 index 0000000..1e44bd4 --- /dev/null +++ b/docker-compose.apache-php.yml @@ -0,0 +1,13 @@ +services: + + server-php: + image: ${APACHE_PHP_VERSION} + + environment: + - APACHE_ADMIN_EMAIL=${APACHE_ADMIN_EMAIL} + + volumes: + - ./www:/var/www/html + - ./host/apache/logs:/var/log/apache2 + - ./host/apache/conf/vhost.conf:/etc/apache2/sites-available/000-default.conf + - ./host/apache/conf/apache2.conf:/etc/apache2/conf-enabled/docker.conf \ No newline at end of file diff --git a/docker-compose.lets-encrypt.yml b/docker-compose.lets-encrypt.yml index 74faae6..e972466 100644 --- a/docker-compose.lets-encrypt.yml +++ b/docker-compose.lets-encrypt.yml @@ -8,9 +8,9 @@ services: volumes: - ./certs/letsencrypt:/letsencrypt - apache-php: + server-php: labels: - - "traefik.http.routers.${CONTAINER_PREFIX}_php.tls.certresolver=letsencrypt" + - "traefik.http.routers.${CONTAINER_PREFIX}_server_php.tls.certresolver=letsencrypt" phpmyadmin: labels: diff --git a/docker-compose.yml b/docker-compose.yml index 04ce4cb..6977fd0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,27 +23,18 @@ services: networks: - backend - # Configuration d'Apache et de PHP - apache-php: + # Configuration du serveur PHP + server-php: restart: unless-stopped - container_name: ${CONTAINER_PREFIX}_apache_php - image: ${APACHE_PHP_VERSION} - environment: - - APACHE_ADMIN_EMAIL=${APACHE_ADMIN_EMAIL} - volumes: - - ./www:/var/www/html - - ./host/apache/logs:/var/log/apache2 - - ./host/apache/conf/vhost.conf:/etc/apache2/sites-available/000-default.conf - - ./host/apache/conf/apache2.conf:/etc/apache2/conf-enabled/docker.conf + container_name: ${CONTAINER_PREFIX}_server_php depends_on: - database labels: - traefik.enable=true - traefik.docker.network=frontend - - traefik.http.routers.${CONTAINER_PREFIX}_apache_php.rule=Host(`${PROJECT_URL}`) - - traefik.http.routers.${CONTAINER_PREFIX}_apache_php.entrypoints=web - - traefik.http.routers.${CONTAINER_PREFIX}_apache_php.entrypoints=websecure - - traefik.http.routers.${CONTAINER_PREFIX}_apache_php.tls=true + - traefik.http.routers.${CONTAINER_PREFIX}_server_php.rule=Host(`${PROJECT_URL}`) + - traefik.http.routers.${CONTAINER_PREFIX}_server_php.entrypoints=websecure + - traefik.http.routers.${CONTAINER_PREFIX}_server_php.tls=true networks: - frontend - backend @@ -59,7 +50,6 @@ services: - traefik.enable=true - traefik.docker.network=frontend - traefik.http.routers.${CONTAINER_PREFIX}_pma.rule=Host(`${PHPMYADMIN_URL}`) - - traefik.http.routers.${CONTAINER_PREFIX}_pma.entrypoints=web - traefik.http.routers.${CONTAINER_PREFIX}_pma.entrypoints=websecure - traefik.http.routers.${CONTAINER_PREFIX}_pma.tls=true environment: