andil/THE-TIP-TOP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve deployment compose conflicts
All checks were successful
Tests / Backend - Tests skipped: 7, passed: 27
Details
THE-TIP-TOP-MULTIBRANCH/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Andil
2026-08-20 23:27:51 +00:00
parent 3a0dd25ed2
commit 12685c1b22
3 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
deploy/dev/docker-compose.yml
View File

@@ -36,18 +36,9 @@ services:
NODE_ENV: development NODE_ENV: development
DATABASE_URL: postgresql://tiptop:tiptop_dev_password@postgres:5432/the_tip_top_db DATABASE_URL: postgresql://tiptop:tiptop_dev_password@postgres:5432/the_tip_top_db
JWT_SECRET: dev_secret_change_me JWT_SECRET: dev_secret_change_me
<<<<<<< HEAD
APP_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr 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 API_PUBLIC_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr
======= FRONTEND_URL: https://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 <no-reply@tiptop.local>"
>>>>>>> github/Emmanuel
# Injectés par le pipeline, jamais commités. Vides, les routes de # Injectés par le pipeline, jamais commités. Vides, les routes de
# connexion externe répondent 503 sans bloquer le démarrage. # connexion externe répondent 503 sans bloquer le démarrage.

11
deploy/preprod/docker-compose.yml
View File

@@ -36,18 +36,9 @@ services:
NODE_ENV: preproduction NODE_ENV: preproduction
DATABASE_URL: postgresql://tiptop_preprod:tiptop_preprod_password@postgres:5432/the_tip_top_preprod DATABASE_URL: postgresql://tiptop_preprod:tiptop_preprod_password@postgres:5432/the_tip_top_preprod
JWT_SECRET: preprod_secret_change_me JWT_SECRET: preprod_secret_change_me
<<<<<<< HEAD
APP_URL: https://api-preprod.dsp5-archi-o24a-4-5-g4.fr 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 API_PUBLIC_URL: https://api-preprod.dsp5-archi-o24a-4-5-g4.fr
======= FRONTEND_URL: https://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 <no-reply@tiptop.local>"
>>>>>>> github/Emmanuel
# Injectés par le pipeline, jamais commités. Vides, les routes de # Injectés par le pipeline, jamais commités. Vides, les routes de
# connexion externe répondent 503 sans bloquer le démarrage. # connexion externe répondent 503 sans bloquer le démarrage.

12
deploy/prod/docker-compose.yml
View File

@@ -36,19 +36,9 @@ services:
NODE_ENV: production NODE_ENV: production
DATABASE_URL: postgresql://tiptop_prod:tiptop_prod_password@postgres:5432/the_tip_top_prod DATABASE_URL: postgresql://tiptop_prod:tiptop_prod_password@postgres:5432/the_tip_top_prod
JWT_SECRET: prod_secret_change_me JWT_SECRET: prod_secret_change_me
<<<<<<< HEAD
APP_URL: https://api.dsp5-archi-o24a-4-5-g4.fr APP_URL: https://api.dsp5-archi-o24a-4-5-g4.fr
API_PUBLIC_URL: https://api.dsp5-archi-o24a-4-5-g4.fr API_PUBLIC_URL: https://api.dsp5-archi-o24a-4-5-g4.fr
======= FRONTEND_URL: https://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 <no-reply@tiptop.local>"
>>>>>>> github/Emmanuel
# Injectés par le pipeline, jamais commités. Vides, les routes de # Injectés par le pipeline, jamais commités. Vides, les routes de
# connexion externe répondent 503 sans bloquer le démarrage. # connexion externe répondent 503 sans bloquer le démarrage.