feat: ajout des labels Consul pour améliorer la découverte de services
- Mise à jour registrator vers l'image master - Ajout labels SERVICE_NAME et health checks pour tous les services - Gitea: labels avec health checks HTTP et TCP - Woodpecker: labels pour server et agent avec health checks - PostgreSQL: labels avec health check TCP - Ajout .env.example et .gitignore pour postgres
This commit is contained in:
@ -1,4 +1,3 @@
|
|||||||
GNU nano 7.2 /opt/gitea/docker-compose.yml
|
|
||||||
version: "3.9"
|
version: "3.9"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
@ -7,6 +6,16 @@ services:
|
|||||||
image: gitea/gitea:latest
|
image: gitea/gitea:latest
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
|
labels:
|
||||||
|
- "SERVICE_NAME=gitea"
|
||||||
|
- "SERVICE_TAGS=web,git"
|
||||||
|
- "SERVICE_3000_NAME=gitea"
|
||||||
|
- "SERVICE_3000_CHECK_HTTP=/api/v1/version"
|
||||||
|
- "SERVICE_3000_CHECK_INTERVAL=15s"
|
||||||
|
- "SERVICE_22_NAME=gitea-ssh"
|
||||||
|
- "SERVICE_22_CHECK_TCP=true"
|
||||||
|
- "SERVICE_22_CHECK_INTERVAL=30s"
|
||||||
|
|
||||||
env_file:
|
env_file:
|
||||||
- gitea.env
|
- gitea.env
|
||||||
|
|
||||||
|
|||||||
11
postgres/.env.example
Normal file
11
postgres/.env.example
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# Exemple de fichier .env pour PostgreSQL Gitea
|
||||||
|
# Copiez ce fichier vers .env et remplissez les valeurs réelles
|
||||||
|
# ATTENTION: Ne versionnez JAMAIS le fichier .env dans git
|
||||||
|
#
|
||||||
|
# Pour créer le fichier .env, exécutez:
|
||||||
|
# cp .env.example .env
|
||||||
|
# Puis éditez .env avec les vraies valeurs
|
||||||
|
|
||||||
|
POSTGRES_USER=gitea
|
||||||
|
POSTGRES_PASSWORD='VotreMotDePasseSecurise'
|
||||||
|
POSTGRES_DB=gitea
|
||||||
7
postgres/.gitignore
vendored
Normal file
7
postgres/.gitignore
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# Fichier contenant les secrets - ne pas versionner
|
||||||
|
.env
|
||||||
|
|
||||||
|
# Fichiers temporaires
|
||||||
|
*.log
|
||||||
|
*.tmp
|
||||||
|
|
||||||
@ -6,6 +6,13 @@ services:
|
|||||||
image: postgres:14
|
image: postgres:14
|
||||||
restart: always
|
restart: always
|
||||||
|
|
||||||
|
labels:
|
||||||
|
- "SERVICE_NAME=gitea-db"
|
||||||
|
- "SERVICE_TAGS=postgres,database"
|
||||||
|
- "SERVICE_5432_NAME=gitea-db"
|
||||||
|
- "SERVICE_5432_CHECK_TCP=true"
|
||||||
|
- "SERVICE_5432_CHECK_INTERVAL=10s"
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: gitea
|
POSTGRES_USER: gitea
|
||||||
POSTGRES_PASSWORD: Gitea_Db-2025_Secure
|
POSTGRES_PASSWORD: Gitea_Db-2025_Secure
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
services:
|
services:
|
||||||
registrator:
|
registrator:
|
||||||
container_name: registrator
|
container_name: registrator
|
||||||
image: gliderlabs/registrator:latest
|
image: gliderlabs/registrator:master
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# IMPORTANT : Creer le fichier .env a partir de env.template avant le deploiement
|
# IMPORTANT : Creer le fichier .env a partir de env.template avant le deploiement
|
||||||
|
|||||||
@ -7,6 +7,12 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "9001:8000"
|
- "9001:8000"
|
||||||
|
labels:
|
||||||
|
- "SERVICE_NAME=woodpecker"
|
||||||
|
- "SERVICE_TAGS=ci,web"
|
||||||
|
- "SERVICE_8000_NAME=woodpecker"
|
||||||
|
- "SERVICE_8000_CHECK_HTTP=/healthz"
|
||||||
|
- "SERVICE_8000_CHECK_INTERVAL=15s"
|
||||||
environment:
|
environment:
|
||||||
WOODPECKER_GITEA: "true"
|
WOODPECKER_GITEA: "true"
|
||||||
WOODPECKER_GITEA_URL: "http://gitea:3000"
|
WOODPECKER_GITEA_URL: "http://gitea:3000"
|
||||||
@ -28,6 +34,12 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
- woodpecker-server
|
- woodpecker-server
|
||||||
|
labels:
|
||||||
|
- "SERVICE_NAME=woodpecker-agent"
|
||||||
|
- "SERVICE_TAGS=ci,agent"
|
||||||
|
- "SERVICE_3001_NAME=woodpecker-agent"
|
||||||
|
- "SERVICE_3001_CHECK_HTTP=/healthz"
|
||||||
|
- "SERVICE_3001_CHECK_INTERVAL=15s"
|
||||||
environment:
|
environment:
|
||||||
WOODPECKER_SERVER: "woodpecker-server:9000"
|
WOODPECKER_SERVER: "woodpecker-server:9000"
|
||||||
WOODPECKER_AGENT_SECRET: "620d5723e91c8d6b220d50fb3790dc12b7a166181dddbce0e05a616c5b2e4aa6"
|
WOODPECKER_AGENT_SECRET: "620d5723e91c8d6b220d50fb3790dc12b7a166181dddbce0e05a616c5b2e4aa6"
|
||||||
|
|||||||
Reference in New Issue
Block a user