Compare commits

..

7 Commits

Author SHA1 Message Date
syoul
19917b04cd fix(compose): depends_on service_started — le step healthcheck CI gere l'attente
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-20 15:45:39 +01:00
syoul
ec25f02bad fix(compose): suppression EXTRA_JAVA_OPTIONS (non reconnu par DTrack, provoque un crash)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-20 15:43:38 +01:00
syoul
1b3b0fed3e change dns dtrack.asycn.io
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-20 15:40:40 +01:00
syoul
c62000112f fix(ci): docker compose stop avant acme.sh — deregistre les conteneurs de Registrator/Fabio
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-03-19 14:56:10 +01:00
syoul
1652c9181f fix(ci): acme.sh avant docker compose up — evite conflit route Registrator vs well-known challenge
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-19 14:54:18 +01:00
syoul
47593d5001 fix(ci): suppression consul_token + KV Fabio — routing gere par Registrator via labels
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-03-19 14:51:52 +01:00
syoul
aa022ae18e feat(ci): ajout acme.sh TLS + routes Fabio KV :443 dans deploy 2026-03-19 14:50:12 +01:00
2 changed files with 25 additions and 3 deletions

View File

@@ -51,9 +51,33 @@ steps:
- cd /opt/dtrack && docker compose config
- echo "=== pull ==="
- cd /opt/dtrack && docker compose pull --no-parallel
- echo "=== stop (deregistre Registrator avant challenge ACME) ==="
- cd /opt/dtrack && docker compose stop
- |
DOMAIN=$(grep '^DTRACK_DOMAIN=' /opt/dtrack/.env | cut -d= -f2)
# --- Certificat TLS ---
# Apres docker compose stop : Registrator a deregistre les conteneurs de Fabio.
# La route globale */.well-known/acme-challenge/* peut repondre sans interference.
# Exit 0 = emis/renouvele, exit 2 = skip (cert valide), autres = erreur
ACME_EXIT=0
docker exec sonic-acme-1 /app/acme.sh \
--home /etc/acme.sh \
--issue -d "$DOMAIN" \
--webroot /usr/share/nginx/html \
--server letsencrypt \
--accountemail support+acme@asycn.io || ACME_EXIT=$?
if [ "$ACME_EXIT" -ne 0 ] && [ "$ACME_EXIT" -ne 2 ]; then
echo "ERREUR: acme.sh a echoue (exit $ACME_EXIT)"
exit 1
fi
docker exec sonic-acme-1 cp /etc/acme.sh/$DOMAIN/fullchain.cer /host/certs/$DOMAIN-cert.pem
docker exec sonic-acme-1 cp /etc/acme.sh/$DOMAIN/$DOMAIN.key /host/certs/$DOMAIN-key.pem
echo "Cert TLS: /host/certs/$DOMAIN-cert.pem OK (acme exit $ACME_EXIT)"
- echo "=== up ==="
- cd /opt/dtrack && docker compose up -d --remove-orphans
- cd /opt/dtrack && docker compose ps
# Fabio routing gere automatiquement par Registrator via les labels SERVICE_* du compose
# TEST deploy : verifie que les conteneurs sont running
# NOTE: pas de ${VAR} (substitue par Woodpecker) — utiliser $VAR sans accolades

View File

@@ -9,10 +9,8 @@ services:
restart: always
environment:
# Stockage H2 interne — suffisant pour une team, pas de PostgreSQL requis
# Les deux formes sont supportees selon la version (< 4.12 vs >= 4.12)
ALPINE_DATABASE_MODE: internal
ALPINE_DATA_DIRECTORY: /data
EXTRA_JAVA_OPTIONS: "-Xmx4g"
volumes:
- dtrack_data:/data
healthcheck:
@@ -42,7 +40,7 @@ services:
API_BASE_URL: https://${DTRACK_DOMAIN}
depends_on:
apiserver:
condition: service_healthy
condition: service_started
networks:
- dtrack-net
- sonic