From c86203b1e5be24b3bd16fbe423c4644a80b45bb8 Mon Sep 17 00:00:00 2001 From: Micha Date: Thu, 30 Apr 2026 11:34:32 +0200 Subject: [PATCH] Inline Grafana secret entrypoint Inline Grafana secret entrypoint --- ops/grafana-influxdb/docker-compose.yml | 8 ++++++-- ops/grafana-influxdb/scripts/grafana-entrypoint.sh | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 ops/grafana-influxdb/scripts/grafana-entrypoint.sh diff --git a/ops/grafana-influxdb/docker-compose.yml b/ops/grafana-influxdb/docker-compose.yml index 0a47619..f1868c7 100644 --- a/ops/grafana-influxdb/docker-compose.yml +++ b/ops/grafana-influxdb/docker-compose.yml @@ -9,11 +9,15 @@ services: GF_SECURITY_ADMIN_PASSWORD__FILE: /run/secrets/grafana_admin_password GF_USERS_ALLOW_SIGN_UP: "false" GF_AUTH_ANONYMOUS_ENABLED: "false" - entrypoint: ["/bin/sh", "/opt/grafana-wrapper/grafana-entrypoint.sh"] + entrypoint: + - /bin/sh + - -c + - | + export GRAFANA_INFLUXDB_TOKEN="$$(cat /run/secrets/grafana_influxdb_token)" + exec /run.sh volumes: - /mnt/user/appdata/grafana:/var/lib/grafana - ./provisioning:/etc/grafana/provisioning:ro - - ./scripts:/opt/grafana-wrapper:ro secrets: - grafana_admin_password - grafana_influxdb_token diff --git a/ops/grafana-influxdb/scripts/grafana-entrypoint.sh b/ops/grafana-influxdb/scripts/grafana-entrypoint.sh deleted file mode 100644 index 5db9cab..0000000 --- a/ops/grafana-influxdb/scripts/grafana-entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -set -eu - -export GRAFANA_INFLUXDB_TOKEN="$(cat /run/secrets/grafana_influxdb_token)" -exec /run.sh