From 1cd81a78a48b584ccdd71776da9f4f127318a14e Mon Sep 17 00:00:00 2001
From: lijianguo <lijianguo@zhumengyuan.com>
Date: Mon, 7 Mar 2022 14:30:31 +0800
Subject: [PATCH] chore(dockerfile): use uid gid

---
 grafana/rootfs/Dockerfile  | 25 ++++++++++++-------------
 telegraf/rootfs/Dockerfile | 28 ++++++++++++++--------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/grafana/rootfs/Dockerfile b/grafana/rootfs/Dockerfile
index c0375a1..9c275ac 100644
--- a/grafana/rootfs/Dockerfile
+++ b/grafana/rootfs/Dockerfile
@@ -1,20 +1,19 @@
 FROM docker.io/drycc/base:bullseye
 
-ARG DRYCC_UID=1001
-ARG DRYCC_GID=1001
-ARG DRYCC_HOME_DIR=/usr/share/grafana
-
-RUN groupadd drycc --gid $DRYCC_GID \
-  && useradd drycc -u $DRYCC_UID -g $DRYCC_GID -s /bin/bash -m -d $DRYCC_HOME_DIR
+ENV DRYCC_UID=1001 \
+  DRYCC_GID=1001 \
+  DRYCC_HOME_DIR=/usr/share/grafana \
+  GRAFANA_VERSION="8.3.6" \
+  ENVTPL_VERSION="1.0.0"
 
+RUN groupadd drycc --gid ${DRYCC_GID} \
+  && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}
 
 COPY . /
-ENV GRAFANA_VERSION="8.3.6" \
-    ENVTPL_VERSION="1.0.0"
 
 RUN install-packages fontconfig curl \
-  && install-stack grafana $GRAFANA_VERSION \
-  && install-stack envtpl $ENVTPL_VERSION \
+  && install-stack grafana ${GRAFANA_VERSION} \
+  && install-stack envtpl ${ENVTPL_VERSION} \
   && rm -rf \
       /usr/share/doc \
       /usr/share/man \
@@ -28,14 +27,14 @@ RUN install-packages fontconfig curl \
       /lib/udev \
       /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/IBM* \
       /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/EBC* \
-  && bash -c "mkdir -p /usr/share/man/man{1..8}" \
+  && mkdir -p /usr/share/man/man{1..8} \
   && mkdir /var/lib/grafana -p \
   && chown -R drycc:drycc /opt/drycc/grafana /usr/share/grafana /var/lib/grafana \
   && chmod +x /usr/share/grafana/start-grafana \
   && chmod 644 /usr/share/grafana/grafana.ini.tpl \
   && chmod +x /usr/share/grafana/entrypoint.sh
 
-USER drycc
-WORKDIR $DRYCC_HOME_DIR
+USER ${DRYCC_UID}
+WORKDIR ${DRYCC_HOME_DIR}
 CMD ["./start-grafana"]
 EXPOSE 3000
diff --git a/telegraf/rootfs/Dockerfile b/telegraf/rootfs/Dockerfile
index 7f5616c..6904df3 100644
--- a/telegraf/rootfs/Dockerfile
+++ b/telegraf/rootfs/Dockerfile
@@ -1,20 +1,20 @@
 FROM docker.io/drycc/base:bullseye
 
-ARG DRYCC_UID=1001
-ARG DRYCC_GID=1001
-ARG DRYCC_HOME_DIR=/home/telegraf
+ENV DRYCC_UID=1001 \
+  DRYCC_GID=1001 \
+  DRYCC_HOME_DIR=/home/telegraf \
+  TELEGRAF_VERSION="1.21.3" \
+  ENVTPL_VERSION="1.0.0" \
+  JQ_VERSION="1.6"
 
-RUN groupadd drycc --gid $DRYCC_GID \
-  && useradd drycc -u $DRYCC_UID -g $DRYCC_GID -s /bin/bash -m -d $DRYCC_HOME_DIR
+RUN groupadd drycc --gid ${DRYCC_GID} \
+  && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}
 
 COPY . /
-ENV TELEGRAF_VERSION="1.21.3" \
-    ENVTPL_VERSION="1.0.0" \
-    JQ_VERSION="1.6"
 
-RUN install-stack telegraf $TELEGRAF_VERSION \
-  && install-stack envtpl $ENVTPL_VERSION \
-  && install-stack jq $JQ_VERSION \
+RUN install-stack telegraf ${TELEGRAF_VERSION} \
+  && install-stack envtpl ${ENVTPL_VERSION} \
+  && install-stack jq ${JQ_VERSION} \
   && rm -rf \
       /usr/share/doc \
       /usr/share/man \
@@ -29,8 +29,8 @@ RUN install-stack telegraf $TELEGRAF_VERSION \
       /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/IBM* \
       /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/EBC* \
   && mkdir -p /usr/share/man/man{1..8} \
-  && chown -R drycc:drycc $DRYCC_HOME_DIR
+  && chown -R ${DRYCC_UID}:${DRYCC_GID} ${DRYCC_HOME_DIR}
 
-USER drycc
-WORKDIR $DRYCC_HOME_DIR
+USER ${DRYCC_UID}
+WORKDIR ${DRYCC_HOME_DIR}
 CMD ["/home/telegraf/start-telegraf"]