From 7ca0bec145bb5c8d4db94d7c948f0c35c29d3444 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 9 Jan 2026 18:38:57 +0100 Subject: [PATCH] Mercure en hostfile --- config/packages/mercure.yaml | 3 +-- docker/compose.yaml | 8 ++++++++ docker/setup.sh | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/packages/mercure.yaml b/config/packages/mercure.yaml index a4c87b7..a0ce965 100644 --- a/config/packages/mercure.yaml +++ b/config/packages/mercure.yaml @@ -4,5 +4,4 @@ mercure: url: '%env(MERCURE_URL)%' public_url: '%env(MERCURE_PUBLIC_URL)%' jwt: - secret: '%env(MERCURE_JWT_SECRET)%' - publish: ['*'] + value: '%env(MERCURE_PUBLISHER_JWT_TOKEN)%' diff --git a/docker/compose.yaml b/docker/compose.yaml index a36e7e0..743e7d9 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -9,6 +9,7 @@ services: container_name: escapepage-php volumes: - ../:/var/www/html:delegated + - /etc/hosts:/etc/hosts:ro environment: APP_ENV: ${APP_ENV:-dev} depends_on: @@ -26,6 +27,7 @@ services: container_name: escapepage-php-worker volumes: - ../:/var/www/html:delegated + - /etc/hosts:/etc/hosts:ro environment: APP_ENV: ${APP_ENV:-dev} depends_on: @@ -45,6 +47,7 @@ services: volumes: - ../:/var/www/html:ro - ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro + - /etc/hosts:/etc/hosts:ro depends_on: - php networks: @@ -57,6 +60,8 @@ services: container_name: escapepage-mailer ports: - "8025:8025" + volumes: + - /etc/hosts:/etc/hosts:ro networks: backend: ipv4_address: 172.20.0.13 @@ -77,6 +82,8 @@ services: anonymous ports: - "8090:80" + volumes: + - /etc/hosts:/etc/hosts:ro networks: backend: ipv4_address: 172.20.0.14 @@ -101,6 +108,7 @@ services: volumes: - ../var/volumes/db:/var/lib/mysql:rw - ./mysql/init:/docker-entrypoint-initdb.d:ro + - /etc/hosts:/etc/hosts:ro # Uncomment the two lines below if you need to access MySQL from your host (workbench, etc.) ports: - "3306:3306" diff --git a/docker/setup.sh b/docker/setup.sh index 0415a4d..22b0b6c 100644 --- a/docker/setup.sh +++ b/docker/setup.sh @@ -28,7 +28,7 @@ else fi # Helper to run docker compose from the docker/ directory -dc() { (cd "$DOCKER_DIR" && $DOCKER_COMPOSE -f compose.yaml "$@"); } +dc() { (cd "$DOCKER_DIR" && $DOCKER_COMPOSE --env-file ../.env -f compose.yaml "$@"); } REBUILD=1 RECREATE=0