From 940834d993a90e4544bf0fcf6237165093aee575 Mon Sep 17 00:00:00 2001
From: syoul <syoul@librezo.fr>
Date: Thu, 19 Mar 2026 18:31:05 +0100
Subject: [PATCH] refactor: COMPOSE_PROJECT_NAME dynamique depuis les vars CI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

docker-compose.business.yml:
- Ajout name: ${COMPOSE_PROJECT_NAME:-ajr-techradardev-main}
- container_name et SERVICE_3000_NAME utilisent COMPOSE_PROJECT_NAME

.woodpecker.yml:
- write-env génère COMPOSE_PROJECT_NAME=owner-repo-branch (même convention que prestashop)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .woodpecker.yml             | 2 ++
 docker-compose.business.yml | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 088bbb4..da10be9 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -31,6 +31,8 @@ steps:
         from_secret: radar_domain
     commands:
       - env | grep -E "^(RADAR_DOMAIN)=" > .env.deploy
+      # COMPOSE_PROJECT_NAME : convention user-project-branch, genere depuis les vars CI
+      - OWNER=$(echo "$CI_REPO_OWNER" | tr 'A-Z' 'a-z') && REPO=$(echo "$CI_REPO_NAME" | tr 'A-Z' 'a-z') && BRANCH=$(echo "$CI_COMMIT_BRANCH" | tr 'A-Z/' 'a-z-') && echo "COMPOSE_PROJECT_NAME=$OWNER-$REPO-$BRANCH" >> .env.deploy
       - echo "Fichier .env.deploy cree ($(wc -c < .env.deploy) octets)"
 
   # Etape 2b : Deploiement sur sonic via Docker socket
diff --git a/docker-compose.business.yml b/docker-compose.business.yml
index eb5e25f..66ec2b8 100644
--- a/docker-compose.business.yml
+++ b/docker-compose.business.yml
@@ -1,6 +1,10 @@
+# Convention de nommage : user-project-branch (ex: ajr-techradardev-main)
+# Permet plusieurs instances en parallele (prod/test) sans collision
+name: ${COMPOSE_PROJECT_NAME:-ajr-techradardev-main}
+
 services:
   radar-business:
-    container_name: laplank-radar-technolologique
+    container_name: ${COMPOSE_PROJECT_NAME:-ajr-techradardev-main}-app
     build:
       context: .
       dockerfile: Dockerfile.business
@@ -15,7 +19,7 @@ services:
     labels:
       # Registrator lit l'IP du conteneur depuis le reseau "sonic" (-useIpFromNetwork sonic)
       # et enregistre le service dans Consul avec le tag urlprefix- -> Fabio route vers ce service
-      - SERVICE_3000_NAME=laplank-radar-business
+      - SERVICE_3000_NAME=${COMPOSE_PROJECT_NAME:-ajr-techradardev-main}-app-3000
       - SERVICE_3000_TAGS=urlprefix-${RADAR_DOMAIN}/
       - SERVICE_3000_CHECK_TCP=true
       # sonic-acme-1 (acme-companion) emet le cert TLS et le copie dans /host/certs/