public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated links tags in favor of depends_on (#106680)

Browse Source 
These prevent grafana from working with podman.
This commit is contained in:
Jason Marshall
2025-07-30 14:49:17 +02:00
committed by GitHub
parent 3ff4c6a2d2
commit 599fe5a400
8 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devenv/docker/blocks/auth/authentik/docker-compose.yaml
+2 -8
View File
@@ -35,8 +35,8 @@
AUTHENTIK_HOST: http://authentik:9000
AUTHENTIK_INSECURE: "true"
AUTHENTIK_TOKEN: 77vDKwFWqCAsD9ykbH6vsGuMHtloM6urfeglrR9KRhWFcABtwmGGiQWHQStw
links:
- "authentik:authentik"
depends_on:
- "authentik"
authentik:
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.6}
@@ -61,9 +61,6 @@
- ./certs:/certs
- ./custom-templates:/templates
- ./geoip:/geoip
links:
- "authentikdb:authentikdb"
- "authentikredis:authentikredis"
authentik-worker:
image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.6}
@@ -86,6 +83,3 @@
- ./certs:/certs
- ./custom-templates:/templates
- ./geoip:/geoip
links:
- "authentikdb:authentikdb"
- "authentikredis:authentikredis"
devenv/docker/blocks/auth/jwt_proxy/docker-compose.yaml
+1 -3
View File
@@ -25,8 +25,6 @@
- 8087:8080
depends_on:
- oauthkeycloakdb
links:
- "oauthkeycloakdb:oauthkeycloakdb"
restart: unless-stopped
oauthproxy:
@@ -54,4 +52,4 @@
- "env.grafana.local:host-gateway"
ports:
- 8088:8088
restart: unless-stopped
restart: unless-stopped
devenv/docker/blocks/auth/oauth/docker-compose.yaml
-2
View File
@@ -25,6 +25,4 @@
- 8087:8080
depends_on:
- oauthkeycloakdb
links:
- "oauthkeycloakdb:oauthkeycloakdb"
restart: unless-stopped
devenv/docker/blocks/collectd/docker-compose.yaml
+1 -1
View File
@@ -7,5 +7,5 @@
GRAPHITE_PREFIX: collectd.
REPORT_BY_CPU: 'false'
COLLECT_INTERVAL: 10
links:
depends_on:
- graphite
devenv/docker/blocks/influxdb/docker-compose.yaml
-2
View File
@@ -17,8 +17,6 @@
telegraf:
image: telegraf:latest
links:
- influxdb
depends_on:
- influxdb
volumes:
devenv/docker/blocks/influxdb1/docker-compose.yaml
+2 -2
View File
@@ -14,7 +14,7 @@
fake-influxdb1-data:
image: grafana/fake-data-gen
links:
depends_on:
- influxdb1
environment:
FD_SERVER: influxdb1
@@ -23,7 +23,7 @@
telegraf-influxdb1:
image: telegraf:latest
links:
depends_on:
- influxdb1
volumes:
- ./docker/blocks/influxdb1/telegraf.conf:/etc/telegraf/telegraf.conf:ro
devenv/docker/blocks/tempo/docker-compose.yaml
+8 -8
View File
@@ -11,7 +11,7 @@
JAEGER_SAMPLER_PARAM: 1
labels:
namespace: tns
logging:
logging:
driver: loki
options:
loki-url: 'http://localhost:3100/api/prom/push'
@@ -27,7 +27,7 @@
command:
- '-log.level=debug'
- 'http://db'
links:
depends_on:
- db
ports:
- 0.0.0.0:8001:80
@@ -38,7 +38,7 @@
JAEGER_SAMPLER_PARAM: 1
labels:
namespace: tns
logging:
logging:
driver: loki
options:
loki-url: 'http://localhost:3100/api/prom/push'
@@ -54,7 +54,7 @@
command:
- '-log.level=debug'
- 'http://app'
links:
depends_on:
- app
ports:
- 0.0.0.0:8002:80
@@ -65,7 +65,7 @@
JAEGER_SAMPLER_PARAM: 1
labels:
namespace: tns
logging:
logging:
driver: loki
options:
loki-url: 'http://localhost:3100/api/prom/push'
@@ -93,7 +93,7 @@
- --enable-feature=native-histograms
volumes:
- ./docker/blocks/tempo/prometheus.yaml:/etc/prometheus.yaml
links:
depends_on:
- app
- db
- loadgen
@@ -101,7 +101,7 @@
- "9090:9090"
labels:
namespace: monitoring
logging:
logging:
driver: loki
options:
loki-url: 'http://localhost:3100/api/prom/push'
@@ -117,7 +117,7 @@
- "3100:3100"
labels:
namespace: monitoring
logging:
logging:
driver: loki
options:
loki-url: 'http://localhost:3100/api/prom/push'
devenv/docker/blocks/traefik/docker-compose.yml
+1 -1
View File
@@ -9,7 +9,7 @@ services:
ports:
- '80:80'
- '8080:8080'
links:
depends_on:
- grafana-subpath
grafana-subpath: