refactor: COMPOSE_PROJECT_NAME dynamique depuis les vars CI
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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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/
|
||||
|
||||
Reference in New Issue
Block a user