From 42d006ee6ec77eceb7e9e9a174bd02d0ac32e9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Olivier?= Date: Sat, 20 Jun 2026 07:33:40 +0200 Subject: [PATCH] Clean repo and add deployment script for Bonsai --- bonsai-api/.env.example | 4 --- bonsai-api/docker-compose.yml | 54 -------------------------------- bonsai-webapp/docker-compose.yml | 27 ---------------- bonsai/deploy.sh | 4 +++ 4 files changed, 4 insertions(+), 85 deletions(-) delete mode 100644 bonsai-api/.env.example delete mode 100644 bonsai-api/docker-compose.yml delete mode 100644 bonsai-webapp/docker-compose.yml create mode 100755 bonsai/deploy.sh diff --git a/bonsai-api/.env.example b/bonsai-api/.env.example deleted file mode 100644 index 635bf4b..0000000 --- a/bonsai-api/.env.example +++ /dev/null @@ -1,4 +0,0 @@ -# Mot de passe PostgreSQL partagé entre le container db et l'API Spring Boot. -# Copier ce fichier en .env et définir une valeur sécurisée avant de démarrer. -# cp .env.example .env -POSTGRES_PASSWORD=changeme diff --git a/bonsai-api/docker-compose.yml b/bonsai-api/docker-compose.yml deleted file mode 100644 index f4467d4..0000000 --- a/bonsai-api/docker-compose.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: bonsai-api-stack - -services: - db: - image: postgres:16-alpine - container_name: bonsai-api-db - restart: unless-stopped - environment: - POSTGRES_DB: bonsai - POSTGRES_USER: bonsai - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - TZ: Europe/Paris - healthcheck: - test: ["CMD-SHELL", "pg_isready -U bonsai -d bonsai"] - interval: 10s - timeout: 5s - retries: 5 - volumes: - - ~/Applications/data/bonsai-api/db_data:/var/lib/postgresql/data - networks: - - bonsai-api-net - - api: - image: git.goutailler-olivier.com/bonsai/bonsai-api:latest - container_name: bonsai-api - restart: unless-stopped - depends_on: - db: - condition: service_healthy - environment: - DATASOURCE_URL: jdbc:postgresql://db:5432/bonsai - DATASOURCE_USERNAME: bonsai - DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD} - KEYCLOAK_JWKS_URI: https://auth.goutailler-olivier.com/realms/bonsai/protocol/openid-connect/certs - CORS_ALLOWED_ORIGIN_PROD: https://bonsai.goutailler-olivier.com - TZ: Europe/Paris - networks: - - bonsai-api-net - - proxy - labels: - - traefik.enable=true - - traefik.http.routers.bonsai-api.rule=Host(`bonsai.goutailler-olivier.com`) && PathPrefix(`/api`) - - traefik.http.routers.bonsai-api.entrypoints=websecure - - traefik.http.routers.bonsai-api.tls.certresolver=le - - traefik.http.services.bonsai-api.loadbalancer.server.port=8080 - - traefik.docker.network=proxy - - com.centurylinklabs.watchtower.enable=true - -networks: - bonsai-api-net: - driver: bridge - proxy: - external: true - name: proxy diff --git a/bonsai-webapp/docker-compose.yml b/bonsai-webapp/docker-compose.yml deleted file mode 100644 index 729b7b9..0000000 --- a/bonsai-webapp/docker-compose.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: bonsai-webapp - -services: - bonsai-webapp: - image: git.goutailler-olivier.com/bonsai/bonsai-webapp:latest - container_name: bonsai-webapp - restart: unless-stopped - - environment: - TZ: Europe/Paris - - networks: - - proxy - - labels: - - traefik.enable=true - - traefik.http.routers.bonsai-webapp.rule=Host(`bonsai.goutailler-olivier.com`) - - traefik.http.routers.bonsai-webapp.entrypoints=websecure - - traefik.http.routers.bonsai-webapp.tls.certresolver=le - - traefik.http.services.bonsai-webapp.loadbalancer.server.port=80 - - traefik.docker.network=proxy - - com.centurylinklabs.watchtower.enable=true - -networks: - proxy: - external: true - name: proxy diff --git a/bonsai/deploy.sh b/bonsai/deploy.sh new file mode 100755 index 0000000..3a70229 --- /dev/null +++ b/bonsai/deploy.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +CACHEBUST=$(date +%s) docker compose build +docker compose up -d