diff --git a/.env.prod b/.env.prod index 24e79af..2f0fb59 100644 --- a/.env.prod +++ b/.env.prod @@ -14,8 +14,6 @@ TRUSTED_PROXIES=127.0.0.1,172.20.0.1,172.20.0.0/16 TRUSTED_HOSTS=^.*$ ###< symfony/framework-bundle ### -SITE_BASE_URL=https://escapepage.com - ###> mercure ### # Use the production URL for CORS in production MERCURE_JWT_SECRET=55UtgFXsZu09TSTdeIA7ljK4HUo9DLkRzEB7MD5tqOLjRfAb @@ -25,6 +23,8 @@ MERCURE_CORS_ALLOWED_ORIGINS=https://escapepage.com MERCURE_TOPIC_BASE=https://escapepage.com ###< mercure ### +SITE_BASE_URL=https://escapepage.com + DB_HOST=database DB_PORT=3306 DB_NAME=escapepage diff --git a/docker/compose.yaml b/docker/compose.yaml index d8f806a..30e0987 100644 --- a/docker/compose.yaml +++ b/docker/compose.yaml @@ -14,9 +14,10 @@ services: - /etc/hosts:/etc/hosts:ro env_file: - .env + - ../.env environment: - APP_ENV: ${APP_ENV} - SITE_BASE_URL: ${SITE_BASE_URL} + APP_ENV: ${APP_ENV:-prod} + SITE_BASE_URL: ${SITE_BASE_URL:-https://escapepage.com} MAILER_DSN: ${MAILER_DSN} MAILER_FROM: ${MAILER_FROM} DATABASE_URL: ${DATABASE_URL} @@ -48,9 +49,10 @@ services: - /etc/hosts:/etc/hosts:ro env_file: - .env + - ../.env environment: - APP_ENV: ${APP_ENV} - SITE_BASE_URL: ${SITE_BASE_URL} + APP_ENV: ${APP_ENV:-prod} + SITE_BASE_URL: ${SITE_BASE_URL:-https://escapepage.com} MAILER_DSN: ${MAILER_DSN} MAILER_FROM: ${MAILER_FROM} DATABASE_URL: ${DATABASE_URL} @@ -105,6 +107,7 @@ services: container_name: escapepage-mercure env_file: - .env + - ../.env environment: SERVER_NAME: ":80" MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_JWT_SECRET} @@ -130,6 +133,7 @@ services: container_name: escapepage-db env_file: - .env + - ../.env environment: MYSQL_DATABASE: ${DB_NAME:-app} MYSQL_USER: ${DB_USER:-app}