From 1e6c61b2827e891a1a83c67cb054630b702f25d4 Mon Sep 17 00:00:00 2001 From: "e.medina" Date: Tue, 14 Oct 2025 10:11:46 +0200 Subject: [PATCH] Utilisation de Debian trixie --- README.md | 2 +- compose.bi.yaml | 3 --- compose.yaml | 21 ++++++--------------- postgresql.Dockerfile | 2 +- 4 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 compose.bi.yaml diff --git a/README.md b/README.md index 51bff4e..7c636ed 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Les solutions pour réaliser un reverse proxy sont généralement [Traefik](http - /var/run/docker.sock:/var/run/docker.sock:ro labels: caddy_admin: "on" -```c +``` ### Administration diff --git a/compose.bi.yaml b/compose.bi.yaml deleted file mode 100644 index 9d27424..0000000 --- a/compose.bi.yaml +++ /dev/null @@ -1,3 +0,0 @@ - - -volumes: diff --git a/compose.yaml b/compose.yaml index 57eeb3a..88f331a 100644 --- a/compose.yaml +++ b/compose.yaml @@ -159,8 +159,6 @@ services: - neo4j_logs:/logs environment: NEO4J_AUTH: neo4j/${DB_ROOT_PASSWORD:-!ChangeMe!} - profiles: - - graph # PostGraphile # Instant GraphQL API @@ -193,9 +191,6 @@ services: - PGUSER=${POSTGRAPHILE_DB_USER:-postgraphile} - PGPASSWORD=${DB_PASSWORD:-!ChangeMe!} - PGDATABASE=${COMPOSE_PROJECT_NAME} - profiles: - - api2 - - graph2 # ---------------------------------------------------------------------- # Web API @@ -226,8 +221,6 @@ services: caddy: postgrest.localhost caddy.reverse_proxy: "{{upstreams 80}}" caddy.tls: internal - profiles: - - api # Scalar # Create world-class API Docs with a built-in interactive playground @@ -249,8 +242,6 @@ services: caddy: scalar.localhost caddy.reverse_proxy: "{{upstreams 8080}}" caddy.tls: internal - profiles: - - api # ---------------------------------------------------------------------- # Mock Web API @@ -267,8 +258,6 @@ services: caddy.mock.localhost.handle_path./api/*: "reverse_proxy {{upstreams 8080}}" caddy.mock.localhost.handle_path.: "redir /ui" caddy.mock.localhost.tls: internal - profiles: - - mock toxiproxy: image: ghcr.io/shopify/toxiproxy @@ -395,8 +384,6 @@ services: caddy: grafana.localhost caddy.reverse_proxy: "{{upstreams 3000}}" caddy.tls: internal - profiles: - - telemetry # Prometheus # Prometheus is an open-source systems monitoring and alerting toolkit @@ -413,8 +400,6 @@ services: - 9090:9090 #extra_hosts: # - host.docker.internal=host-gateway - profiles: - - telemetry volumes: caddy_config: @@ -435,6 +420,12 @@ volumes: configs: pgadmin_config: file: ./pgadmin-servers.json + grafana_datasources: + file: ./grafana/provisionning/datasources + grafana_dashboards: + file: ./grafana/provisionning/dashboards + prometheus_config: + file: ./prometheus networks: caddy_net: diff --git a/postgresql.Dockerfile b/postgresql.Dockerfile index 2c06488..57ff543 100644 --- a/postgresql.Dockerfile +++ b/postgresql.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:forky AS build-essential +FROM debian:trixie AS build-essential RUN set -eux; \ apt-get update; \