chore(dockerfile): use uid gid

Author: lijianguo

.drone/drone.yml

@@ -126,7 +126,7 @@ steps:
   commands:
   - IMAGE_TAG=$([ ! -z $DRONE_TAG ] && echo \"${DRONE_TAG:1}\" || echo \"canary\")
   - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/builder/values.yaml
-  - helm package charts/builder --version ${DRONE_TAG:-v1.0.0}
+  - helm package -u charts/builder --version ${DRONE_TAG:-v1.0.0}
   - curl -u $CHARTMUSEUM_USERNAME:$CHARTMUSEUM_PASSWORD -F chart=@builder-${DRONE_TAG:-v1.0.0}.tgz "$CHARTMUSEUM_API/api/$([ -z $DRONE_TAG ] && echo testing || echo stable)/charts"
   environment:
     CHARTMUSEUM_USERNAME:

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"]

charts/builder/Chart.yaml

@@ -1,7 +1,12 @@
 name: builder
+apiVersion: v2
 home: https://github.com/drycc/builder
-version: v1.0.0
+dependencies:
+  - name: common
+    repository: https://charts.drycc.cc/stable
+    version: 1.x.x
 description: Git server and application builder for Drycc Workflow.
 maintainers:
   - name: Drycc Team
     email: engineering@drycc.com
+version: v1.0.0

charts/builder/templates/_helpers.tpl

@@ -21,7 +21,7 @@ spec:
       labels:
         app: drycc-builder
     spec:
-      {{- include "builder.affinity" . | indent 6 }}
+      {{- include "common.affinities.nodes.soft" (dict "key" "app" "values" (list "drycc-builder")) | indent 6 }}
       serviceAccount: drycc-builder
       initContainers:
       - name: drycc-builder-init