diff --git a/argocd/manifests/grafana/deployment.yaml b/argocd/manifests/grafana/deployment.yaml index 4fbb759..00a5970 100644 --- a/argocd/manifests/grafana/deployment.yaml +++ b/argocd/manifests/grafana/deployment.yaml @@ -88,7 +88,7 @@ spec: mountPath: /tmp/dashboards # Grafana - name: grafana - image: registry.ops.eblu.me/blumeops/grafana:v12.3.3-286a6e7 + image: registry.ops.eblu.me/blumeops/grafana:v12.3.3-b1ea762 imagePullPolicy: IfNotPresent env: - name: POD_IP diff --git a/containers/grafana/Dockerfile b/containers/grafana/Dockerfile index c3107c4..f89adda 100644 --- a/containers/grafana/Dockerfile +++ b/containers/grafana/Dockerfile @@ -45,6 +45,8 @@ RUN mkdir -p /etc/grafana /var/lib/grafana /var/log/grafana && \ RUN adduser -D -u 472 -h /usr/share/grafana grafana && \ chown -R grafana:grafana /usr/share/grafana /etc/grafana /var/lib/grafana /var/log/grafana +ENV PATH="/usr/share/grafana/bin:$PATH" + USER grafana WORKDIR /usr/share/grafana EXPOSE 3000 diff --git a/docs/how-to/grafana/build-grafana-container.md b/docs/how-to/grafana/build-grafana-container.md index ce6c557..d1d9d7c 100644 --- a/docs/how-to/grafana/build-grafana-container.md +++ b/docs/how-to/grafana/build-grafana-container.md @@ -25,6 +25,7 @@ Grafana currently uses the upstream `docker.io/grafana/grafana:11.4.0` image via ## Lessons - **Tarball directory name:** The Grafana OSS tarball extracts to `grafana-` (e.g. `grafana-12.3.3`), *not* `grafana-v`. The `mv` command in the Dockerfile must match this. +- **Binary PATH:** The Grafana binary lives at `bin/grafana` inside the extracted directory. The Dockerfile must add the bin directory to `$PATH` (e.g. `ENV PATH="/usr/share/grafana/bin:$PATH"`) or use the full path in CMD. ## Reference