From 1a1555f0c11252b1fd4ab0451628b8c6422f7710 Mon Sep 17 00:00:00 2001 From: adjoly Date: Tue, 22 Jul 2025 15:23:37 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D=20wip:?= =?UTF-8?q?=20moved=20networks=20and=20volumes=20to=20another=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3 | 17 ----------------- docker/docker-compose.yml | 13 +------------ docker/monitoring/compose.yml | 4 ---- docker/networks.yml | 9 +++++++++ docker/volumes.yml | 5 +++++ 5 files changed, 15 insertions(+), 33 deletions(-) delete mode 100644 3 create mode 100644 docker/networks.yml diff --git a/3 b/3 deleted file mode 100644 index cbe8524..0000000 --- a/3 +++ /dev/null @@ -1,17 +0,0 @@ -global: - scrape_interval: 30s - -# alerting: -# alertmanagers: -# - static_configs: -# - targets: -# - alertmanager:9093 - -scrape_configs: - - job_name: 'prometheus' - metrics_path: '/prometheus/metrics' - basic_auth: - username: admin - password: PROM_ADMIN_PASSWD - static_configs: - - targets: ['localhost:9090'] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index da37536..f3e6ed6 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,6 +2,7 @@ name: ft_transcendence include: - ./volumes.yml + - ./networks.yml - ./monitoring/compose.yml services: @@ -53,15 +54,3 @@ services: - API_TARGET=auth - JWT_SECRET=${JWT_SECRET} restart: unless-stopped - -networks: - front: - name: transcendence-front - back: - name: transcendence-back - -volumes: - db-auth: - name: transcendence-api-auth-db - db-user: - name: transcendence-api-user-db diff --git a/docker/monitoring/compose.yml b/docker/monitoring/compose.yml index 0531544..14c9bc9 100644 --- a/docker/monitoring/compose.yml +++ b/docker/monitoring/compose.yml @@ -1,6 +1,2 @@ include: - ./prometheus/compose.yml - -networks: - prom: - prom-exporter: diff --git a/docker/networks.yml b/docker/networks.yml new file mode 100644 index 0000000..9ce0fe6 --- /dev/null +++ b/docker/networks.yml @@ -0,0 +1,9 @@ +networks: + front: + name: transcendence-front + back: + name: transcendence-back + prom: + name: transcendence-prom + prom-exporter: + name: transcendence-prom-exporter diff --git a/docker/volumes.yml b/docker/volumes.yml index dd93e1d..e67d472 100644 --- a/docker/volumes.yml +++ b/docker/volumes.yml @@ -1,2 +1,7 @@ volumes: prometheus_data: + name: transcendence-prom-data + db-auth: + name: transcendence-api-auth-db + db-user: + name: transcendence-api-user-db