diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index ca0b2a3..16655bd 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -1,4 +1,3 @@ - GNU nano 7.2 /opt/gitea/docker-compose.yml version: "3.9" services: @@ -7,6 +6,16 @@ services: image: gitea/gitea:latest 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: - gitea.env diff --git a/postgres/.env.example b/postgres/.env.example new file mode 100644 index 0000000..d39e3e9 --- /dev/null +++ b/postgres/.env.example @@ -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 diff --git a/postgres/.gitignore b/postgres/.gitignore new file mode 100644 index 0000000..d6511a3 --- /dev/null +++ b/postgres/.gitignore @@ -0,0 +1,7 @@ +# Fichier contenant les secrets - ne pas versionner +.env + +# Fichiers temporaires +*.log +*.tmp + diff --git a/postgres/docker-compose.yml b/postgres/docker-compose.yml index 18a6e64..c8abd88 100644 --- a/postgres/docker-compose.yml +++ b/postgres/docker-compose.yml @@ -6,6 +6,13 @@ services: image: postgres:14 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: POSTGRES_USER: gitea POSTGRES_PASSWORD: Gitea_Db-2025_Secure diff --git a/registrator/docker-compose.yml b/registrator/docker-compose.yml index 168ac94..d1141a6 100644 --- a/registrator/docker-compose.yml +++ b/registrator/docker-compose.yml @@ -1,7 +1,7 @@ services: registrator: container_name: registrator - image: gliderlabs/registrator:latest + image: gliderlabs/registrator:master restart: unless-stopped # IMPORTANT : Creer le fichier .env a partir de env.template avant le deploiement diff --git a/woodpecker/docker-compose.yml b/woodpecker/docker-compose.yml index 30c5352..6a469f0 100644 --- a/woodpecker/docker-compose.yml +++ b/woodpecker/docker-compose.yml @@ -7,6 +7,12 @@ services: restart: unless-stopped ports: - "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: WOODPECKER_GITEA: "true" WOODPECKER_GITEA_URL: "http://gitea:3000" @@ -28,6 +34,12 @@ services: restart: unless-stopped depends_on: - 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: WOODPECKER_SERVER: "woodpecker-server:9000" WOODPECKER_AGENT_SECRET: "620d5723e91c8d6b220d50fb3790dc12b7a166181dddbce0e05a616c5b2e4aa6"