Merge pull request #15 from jianxiaoguo/main

chore(dockerfile): use uid gid

Author: duanhongyi

Dockerfile

@@ -8,9 +8,11 @@ RUN export GO111MODULE=on \
 
 FROM docker.io/drycc/base:bullseye
 
-ARG DRYCC_UID=1001
-ARG DRYCC_GID=1001
-ARG DRYCC_HOME_DIR=/workspace
+ENV DRYCC_UID=1001 \
+  DRYCC_GID=1001 \
+  DRYCC_HOME_DIR=/workspace \
+  MC_VERSION="2022.02.26.03.58.31" \
+  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}
@@ -20,17 +22,14 @@ COPY rootfs/etc/ssh /etc/ssh/
 COPY rootfs/docker-entrypoint.sh /docker-entrypoint.sh
 COPY --from=build /usr/local/bin/boot /usr/bin/boot
 
-ENV MC_VERSION="2022.02.26.03.58.31" \
-  JQ_VERSION="1.6"
-
 RUN install-packages git openssh-server coreutils xz-utils tar \
   && install-stack mc $MC_VERSION \
   && install-stack jq $JQ_VERSION \
   && mkdir -p /var/run/sshd \
   && rm -rf /etc/ssh/ssh_host* \
   && chmod +x /bin/create_bucket /bin/normalize_storage /docker-entrypoint.sh
 
-USER drycc
+USER ${DRYCC_UID}
 WORKDIR ${DRYCC_HOME_DIR}
 
 ENTRYPOINT ["init-stack", "/docker-entrypoint.sh"]