From 12685c1b222b0908556e7039459e4b725559da8d Mon Sep 17 00:00:00 2001 From: Andil Date: Thu, 20 Aug 2026 23:27:51 +0000 Subject: [PATCH] fix: resolve deployment compose conflicts --- deploy/dev/docker-compose.yml | 11 +---------- deploy/preprod/docker-compose.yml | 11 +---------- deploy/prod/docker-compose.yml | 12 +----------- 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/deploy/dev/docker-compose.yml b/deploy/dev/docker-compose.yml index f3f1b5d..b1aaef0 100644 --- a/deploy/dev/docker-compose.yml +++ b/deploy/dev/docker-compose.yml @@ -36,18 +36,9 @@ services: NODE_ENV: development DATABASE_URL: postgresql://tiptop:tiptop_dev_password@postgres:5432/the_tip_top_db JWT_SECRET: dev_secret_change_me -<<<<<<< HEAD APP_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr API_PUBLIC_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr -======= - 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 " ->>>>>>> github/Emmanuel + FRONTEND_URL: https://dev.dsp5-archi-o24a-4-5-g4.fr # Injectés par le pipeline, jamais commités. Vides, les routes de # connexion externe répondent 503 sans bloquer le démarrage. diff --git a/deploy/preprod/docker-compose.yml b/deploy/preprod/docker-compose.yml index 509836e..2729f5e 100644 --- a/deploy/preprod/docker-compose.yml +++ b/deploy/preprod/docker-compose.yml @@ -36,18 +36,9 @@ services: NODE_ENV: preproduction DATABASE_URL: postgresql://tiptop_preprod:tiptop_preprod_password@postgres:5432/the_tip_top_preprod JWT_SECRET: preprod_secret_change_me -<<<<<<< HEAD APP_URL: https://api-preprod.dsp5-archi-o24a-4-5-g4.fr API_PUBLIC_URL: https://api-preprod.dsp5-archi-o24a-4-5-g4.fr -======= - 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 " ->>>>>>> github/Emmanuel + FRONTEND_URL: https://preprod.dsp5-archi-o24a-4-5-g4.fr # Injectés par le pipeline, jamais commités. Vides, les routes de # connexion externe répondent 503 sans bloquer le démarrage. diff --git a/deploy/prod/docker-compose.yml b/deploy/prod/docker-compose.yml index 6b9ab33..56fe5fe 100644 --- a/deploy/prod/docker-compose.yml +++ b/deploy/prod/docker-compose.yml @@ -36,19 +36,9 @@ services: NODE_ENV: production DATABASE_URL: postgresql://tiptop_prod:tiptop_prod_password@postgres:5432/the_tip_top_prod JWT_SECRET: prod_secret_change_me -<<<<<<< HEAD APP_URL: https://api.dsp5-archi-o24a-4-5-g4.fr API_PUBLIC_URL: https://api.dsp5-archi-o24a-4-5-g4.fr -======= - APP_URL: http://192.168.1.23:5003 - FRONTEND_URL: http://192.168.1.23:5175 - - MAIL_HOST: smtp.gmail.com - MAIL_PORT: 587 - MAIL_USER: "" - MAIL_PASS: "" - MAIL_FROM: "The Tip Top " ->>>>>>> github/Emmanuel + FRONTEND_URL: https://dsp5-archi-o24a-4-5-g4.fr # Injectés par le pipeline, jamais commités. Vides, les routes de # connexion externe répondent 503 sans bloquer le démarrage.