From 8adf780da2cc3d5c6385bdcf83452dee263247ed Mon Sep 17 00:00:00 2001 From: Emma781227 Date: Mon, 17 Aug 2026 00:25:27 +0200 Subject: [PATCH] Variables de connexion externe dans les environnements Docker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajoute FRONTEND_URL, absent des trois environnements alors que le callback OAuth et la liste d'origines CORS en dépendent : sans lui le backend retombait sur localhost:5173 et refusait le front déployé. Les identifiants Google et Facebook passent par substitution depuis l'environnement du pipeline, afin de ne pas committer de secret. Ignore aussi test-results/, généré par le reporter jest-junit ajouté par la chaîne CI. Co-Authored-By: Claude Opus 5 --- backend/.gitignore | 3 ++- backend/package-lock.json | 6 +++--- deploy/dev/docker-compose.yml | 8 ++++++++ deploy/preprod/docker-compose.yml | 8 ++++++++ deploy/prod/docker-compose.yml | 8 ++++++++ 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/backend/.gitignore b/backend/.gitignore index 24361b6..ae19cfb 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -2,4 +2,5 @@ node_modules/ .env .prisma coverage/ -dist/ \ No newline at end of file +dist/ +test-results/ diff --git a/backend/package-lock.json b/backend/package-lock.json index 041d3d6..eef9418 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -610,9 +610,9 @@ "license": "MIT" }, "node_modules/@emnapi/wasi-threads": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz", - "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz", + "integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==", "dev": true, "license": "MIT", "optional": true, diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml index 8602afa..2cc738d 100644 --- a/deploy/dev/docker-compose.yml +++ b/deploy/dev/docker-compose.yml @@ -33,12 +33,20 @@ services: DATABASE_URL: postgresql://tiptop:tiptop_dev_password@postgres:5432/the_tip_top_db JWT_SECRET: dev_secret_change_me APP_URL: http://192.168.1.23:5001 + FRONTEND_URL: http://192.168.1.23:5173 MAIL_HOST: smtp.gmail.com MAIL_PORT: 587 MAIL_USER: "" MAIL_PASS: "" MAIL_FROM: "The Tip Top " + # Injectés par le pipeline, jamais commités. Vides, les routes de + # connexion externe répondent 503 sans bloquer le démarrage. + GOOGLE_CLIENT_ID: "${GOOGLE_CLIENT_ID:-}" + GOOGLE_CLIENT_SECRET: "${GOOGLE_CLIENT_SECRET:-}" + FACEBOOK_APP_ID: "${FACEBOOK_APP_ID:-}" + FACEBOOK_APP_SECRET: "${FACEBOOK_APP_SECRET:-}" + command: > sh -c " npx prisma migrate deploy && diff --git a/deploy/preprod/docker-compose.yml b/deploy/preprod/docker-compose.yml index b61eef5..bd1384b 100644 --- a/deploy/preprod/docker-compose.yml +++ b/deploy/preprod/docker-compose.yml @@ -38,12 +38,20 @@ services: DATABASE_URL: postgresql://tiptop_preprod:tiptop_preprod_password@postgres:5432/the_tip_top_preprod JWT_SECRET: preprod_secret_change_me APP_URL: http://192.168.1.23:5002 + FRONTEND_URL: http://192.168.1.23:5174 MAIL_HOST: smtp.gmail.com MAIL_PORT: 587 MAIL_USER: "" MAIL_PASS: "" MAIL_FROM: "The Tip Top Preprod " + # Injectés par le pipeline, jamais commités. Vides, les routes de + # connexion externe répondent 503 sans bloquer le démarrage. + GOOGLE_CLIENT_ID: "${GOOGLE_CLIENT_ID:-}" + GOOGLE_CLIENT_SECRET: "${GOOGLE_CLIENT_SECRET:-}" + FACEBOOK_APP_ID: "${FACEBOOK_APP_ID:-}" + FACEBOOK_APP_SECRET: "${FACEBOOK_APP_SECRET:-}" + command: > sh -c " npx prisma migrate deploy && diff --git a/deploy/prod/docker-compose.yml b/deploy/prod/docker-compose.yml index beeda63..73145df 100644 --- a/deploy/prod/docker-compose.yml +++ b/deploy/prod/docker-compose.yml @@ -38,6 +38,7 @@ services: DATABASE_URL: postgresql://tiptop_prod:tiptop_prod_password@postgres:5432/the_tip_top_prod JWT_SECRET: prod_secret_change_me APP_URL: http://192.168.1.23:5003 + FRONTEND_URL: http://192.168.1.23:5175 MAIL_HOST: smtp.gmail.com MAIL_PORT: 587 @@ -45,6 +46,13 @@ services: MAIL_PASS: "" MAIL_FROM: "The Tip Top " + # Injectés par le pipeline, jamais commités. Vides, les routes de + # connexion externe répondent 503 sans bloquer le démarrage. + GOOGLE_CLIENT_ID: "${GOOGLE_CLIENT_ID:-}" + GOOGLE_CLIENT_SECRET: "${GOOGLE_CLIENT_SECRET:-}" + FACEBOOK_APP_ID: "${FACEBOOK_APP_ID:-}" + FACEBOOK_APP_SECRET: "${FACEBOOK_APP_SECRET:-}" + command: > sh -c " npx prisma migrate deploy &&