From c1401e3e08d037dc47a2f81fa8cecee6fca8964f Mon Sep 17 00:00:00 2001 From: beatz174-bit Date: Mon, 13 Apr 2026 11:27:27 +1000 Subject: [PATCH] Normalize compose service profiles by folder hierarchy --- core/authelia/docker-compose.yml | 2 +- core/crowdsec/docker-compose.yml | 2 +- core/error-pages/docker-compose.yml | 2 +- core/test/docker-compose.yml | 4 ++-- monitoring/docker-exporter/docker-compose.yml | 2 +- monitoring/docker-socket-proxy/docker-compose.yml | 2 +- monitoring/influxdb-service/docker-compose.yml | 2 +- monitoring/node-exporter/docker-compose.yml | 2 +- monitoring/node-red/docker-compose.yml | 2 +- monitoring/pihole-exporter/docker-compose.yml | 2 +- monitoring/telegraf/docker-compose.yml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/authelia/docker-compose.yml b/core/authelia/docker-compose.yml index 23d4ed5..79defa2 100644 --- a/core/authelia/docker-compose.yml +++ b/core/authelia/docker-compose.yml @@ -1,6 +1,6 @@ services: authelia: - profiles: ["core","all","traefik"] + profiles: ["core","all","authelia"] image: authelia/authelia restart: always build: diff --git a/core/crowdsec/docker-compose.yml b/core/crowdsec/docker-compose.yml index b198715..5e0519c 100644 --- a/core/crowdsec/docker-compose.yml +++ b/core/crowdsec/docker-compose.yml @@ -1,7 +1,7 @@ services: crowdsec: + profiles: ["core","all","crowdsec"] # image: crowdsecurity/crowdsec:latest - profiles: ["core","all","traefik"] build: ${PROJECT_ROOT}/core/crowdsec container_name: crowdsec restart: always diff --git a/core/error-pages/docker-compose.yml b/core/error-pages/docker-compose.yml index 3d6b629..cee041b 100644 --- a/core/error-pages/docker-compose.yml +++ b/core/error-pages/docker-compose.yml @@ -1,6 +1,6 @@ services: error-pages: - profiles: ["core","all","traefik"] + profiles: ["core","all","error-pages"] image: tarampampam/error-pages:3 restart: always container_name: error-pages diff --git a/core/test/docker-compose.yml b/core/test/docker-compose.yml index 3ff8517..ce9d0f0 100644 --- a/core/test/docker-compose.yml +++ b/core/test/docker-compose.yml @@ -2,7 +2,7 @@ services: update-test: image: nginx:1.28.1 container_name: update-test - profiles: ["test"] + profiles: ["core","all","test"] healthcheck: test: ["CMD", "curl", "-f", "http://localhost"] # returns 0 if Nginx is up interval: 5s @@ -11,7 +11,7 @@ services: start_period: 2s docker-update-exporter-test: - profiles: ["test"] + profiles: ["core","all","test"] build: context: ${PROJECT_ROOT}/core/test container_name: docker-update-exporter-test diff --git a/monitoring/docker-exporter/docker-compose.yml b/monitoring/docker-exporter/docker-compose.yml index 844c101..4c935a4 100644 --- a/monitoring/docker-exporter/docker-compose.yml +++ b/monitoring/docker-exporter/docker-compose.yml @@ -1,6 +1,6 @@ services: docker-update-exporter: - profiles: ["monitoring","all","prometheus-exporters"] + profiles: ["monitoring","all","docker-exporter"] build: context: ${PROJECT_ROOT}/monitoring/docker-exporter container_name: docker-update-exporter diff --git a/monitoring/docker-socket-proxy/docker-compose.yml b/monitoring/docker-socket-proxy/docker-compose.yml index 51f113e..cfb7e56 100644 --- a/monitoring/docker-socket-proxy/docker-compose.yml +++ b/monitoring/docker-socket-proxy/docker-compose.yml @@ -1,6 +1,6 @@ services: docker-socket-proxy: - profiles: ["monitoring","all","prometheus","prometheus-exporters"] + profiles: ["monitoring","all","docker-socket-proxy"] image: tecnativa/docker-socket-proxy:latest container_name: docker-socket-proxy hostname: docker-socket-proxy diff --git a/monitoring/influxdb-service/docker-compose.yml b/monitoring/influxdb-service/docker-compose.yml index 4cd2cfc..6dc4389 100644 --- a/monitoring/influxdb-service/docker-compose.yml +++ b/monitoring/influxdb-service/docker-compose.yml @@ -1,6 +1,6 @@ services: influxdb: - profiles: ["monitoring","all","prometheus"] + profiles: ["monitoring","all","influxdb-service"] image: influxdb:2.7 container_name: influxdb restart: unless-stopped diff --git a/monitoring/node-exporter/docker-compose.yml b/monitoring/node-exporter/docker-compose.yml index 2ce1fa6..a0a04f8 100644 --- a/monitoring/node-exporter/docker-compose.yml +++ b/monitoring/node-exporter/docker-compose.yml @@ -1,6 +1,6 @@ services: node-exporter: - profiles: ["monitoring","all","prometheus-exporters"] + profiles: ["monitoring","all","node-exporter"] image: prom/node-exporter:latest container_name: node-exporter pid: host diff --git a/monitoring/node-red/docker-compose.yml b/monitoring/node-red/docker-compose.yml index c3f2dbd..3ab5d7f 100644 --- a/monitoring/node-red/docker-compose.yml +++ b/monitoring/node-red/docker-compose.yml @@ -1,10 +1,10 @@ services: node-red: + profiles: ["monitoring","all","node-red"] # image: nodered/node-red:latest build: context: ${PROJECT_ROOT}/monitoring/node-red container_name: node-red - profiles: ["monitoring","all"] restart: unless-stopped depends_on: - docker-socket-proxy diff --git a/monitoring/pihole-exporter/docker-compose.yml b/monitoring/pihole-exporter/docker-compose.yml index 408eb44..d9343d1 100644 --- a/monitoring/pihole-exporter/docker-compose.yml +++ b/monitoring/pihole-exporter/docker-compose.yml @@ -1,6 +1,6 @@ services: pihole-exporter: - profiles: ["monitoring","all","prometheus-exporters"] + profiles: ["monitoring","all","pihole-exporter"] image: ekofr/pihole-exporter:latest container_name: pihole-exporter # env_file: diff --git a/monitoring/telegraf/docker-compose.yml b/monitoring/telegraf/docker-compose.yml index eff9da9..241b96e 100644 --- a/monitoring/telegraf/docker-compose.yml +++ b/monitoring/telegraf/docker-compose.yml @@ -1,6 +1,6 @@ services: telegraf: - profiles: ["monitoring","all","prometheus"] + profiles: ["monitoring","all","telegraf"] image: telegraf:latest container_name: telegraf restart: unless-stopped