From 2be217e0267aa563441c1ebac34a5a36b323de43 Mon Sep 17 00:00:00 2001 From: Andrey Chugunov Date: Thu, 29 Oct 2020 18:02:09 +0400 Subject: [PATCH] Docker: use root group in the custom Dockerfile (#28639) --- packaging/docker/custom/Dockerfile | 3 ++- packaging/docker/custom/ubuntu.Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/docker/custom/Dockerfile b/packaging/docker/custom/Dockerfile index 8ead865dedb..9a6fcf93e3b 100644 --- a/packaging/docker/custom/Dockerfile +++ b/packaging/docker/custom/Dockerfile @@ -6,10 +6,11 @@ USER root ARG GF_INSTALL_IMAGE_RENDERER_PLUGIN="false" +ARG GF_GID="0" ENV GF_PATHS_PLUGINS="/var/lib/grafana-plugins" RUN mkdir -p "$GF_PATHS_PLUGINS" && \ - chown -R grafana:grafana "$GF_PATHS_PLUGINS" + chown -R grafana:${GF_GID} "$GF_PATHS_PLUGINS" RUN if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \ echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \ diff --git a/packaging/docker/custom/ubuntu.Dockerfile b/packaging/docker/custom/ubuntu.Dockerfile index 88a2bf1b638..a6c7a8ce485 100644 --- a/packaging/docker/custom/ubuntu.Dockerfile +++ b/packaging/docker/custom/ubuntu.Dockerfile @@ -9,10 +9,11 @@ ARG DEBIAN_FRONTEND=noninteractive ARG GF_INSTALL_IMAGE_RENDERER_PLUGIN="false" +ARG GF_GID="0" ENV GF_PATHS_PLUGINS="/var/lib/grafana-plugins" RUN mkdir -p "$GF_PATHS_PLUGINS" && \ - chown -R grafana:grafana "$GF_PATHS_PLUGINS" + chown -R grafana:${GF_GID} "$GF_PATHS_PLUGINS" RUN if [ $GF_INSTALL_IMAGE_RENDERER_PLUGIN = "true" ]; then \ apt-get update && \