fix(passport): change uid gid to 1001

Author: duanhongyi

charts/passport/templates/passport-deployment.yaml

@@ -27,7 +27,7 @@ spec:
       - name: drycc-passport-init
         image: docker.io/drycc/python-dev:latest
         imagePullPolicy: {{.Values.imagePullPolicy}}
-        command:
+        args:
           - netcat
           - -v
           - -u

rootfs/Dockerfile

@@ -1,7 +1,7 @@
-FROM docker.io/drycc/base:bullseye  as build-app
+FROM docker.io/drycc/base:bullseye as build-app
 
-ADD web /workspace
-WORKDIR /workspace
+ADD web /web
+WORKDIR /web
 
 ENV NODE_VERSION="16.14.0"
 
@@ -12,27 +12,27 @@ RUN install-stack node $NODE_VERSION && . init-stack \
 
 FROM docker.io/drycc/base:bullseye
 
-RUN adduser --system \
-	--shell /bin/bash \
-	--disabled-password \
-	--home /workspace \
-	--group \
-	drycc
+ARG DRYCC_UID=1001
+ARG DRYCC_GID=1001
+ARG DRYCC_HOME_DIR=/workspace
+
+RUN groupadd drycc --gid ${DRYCC_GID} \
+  && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}
 
 ENV PYTHON_VERSION="3.10.2"
-COPY requirements.txt /workspace/requirements.txt
+COPY requirements.txt ${DRYCC_HOME_DIR}/requirements.txt
 
 RUN buildDeps='gcc rustc cargo libffi-dev musl-dev libldap2-dev libsasl2-dev'; \
     install-packages $buildDeps \
   && install-stack python $PYTHON_VERSION && . init-stack \
-  && python3 -m venv /workspace/.venv \
-  && source /workspace/.venv/bin/activate \
-  && pip3 install --disable-pip-version-check --no-cache-dir -r /workspace/requirements.txt \
-  && chown -R drycc:drycc /workspace \
+  && python3 -m venv ${DRYCC_HOME_DIR}/.venv \
+  && source ${DRYCC_HOME_DIR}/.venv/bin/activate \
+  && pip3 install --disable-pip-version-check --no-cache-dir -r ${DRYCC_HOME_DIR}/requirements.txt \
+  && chown -R drycc:drycc ${DRYCC_HOME_DIR} \
   # set env
-  && echo "source /workspace/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
+  && echo "source ${DRYCC_HOME_DIR}/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
   # cleanup
-  && scanelp /workspace/.venv/lib > runtime.txt \
+  && scanelp ${DRYCC_HOME_DIR}/.venv/lib > runtime.txt \
   && apt-get purge -y --auto-remove $buildDeps \
   && install-packages $(< runtime.txt) \
   && apt-get autoremove -y \
@@ -52,10 +52,11 @@ RUN buildDeps='gcc rustc cargo libffi-dev musl-dev libldap2-dev libsasl2-dev'; \
         /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/EBC* \
   && mkdir -p /usr/share/man/man{1..8}
 
-COPY . /workspace
-COPY --from=build-app /workspace/dist /workspace/web/dist
-
 USER drycc
-WORKDIR /workspace
-CMD ["/workspace/bin/boot"]
+
+COPY --chown=drycc:drycc . ${DRYCC_HOME_DIR}
+COPY --chown=drycc:drycc --from=build-app /web/dist ${DRYCC_HOME_DIR}/web/dist
+
+WORKDIR ${DRYCC_HOME_DIR}
+CMD ["bin/boot"]
 EXPOSE 8000

rootfs/Dockerfile.test

@@ -1,14 +1,9 @@
 FROM docker.io/drycc/base:bullseye
 
-RUN adduser --system \
-	--shell /bin/bash \
-	--disabled-password \
-	--home /workspace \
-	--group \
-	drycc
+ARG DRYCC_HOME_DIR=/workspace
 
-COPY requirements.txt /workspace/requirements.txt
-COPY dev_requirements.txt /workspace/dev_requirements.txt
+COPY requirements.txt ${DRYCC_HOME_DIR}/requirements.txt
+COPY dev_requirements.txt ${DRYCC_HOME_DIR}/dev_requirements.txt
 
 ENV PGDATA="/var/lib/postgresql/data" \
   PYTHON_VERSION="3.10.2" \
@@ -20,15 +15,14 @@ RUN buildDeps='gcc rustc cargo libffi-dev musl-dev libldap2-dev libsasl2-dev'; \
   && install-stack python $PYTHON_VERSION \
   && install-stack postgresql $POSTGRES_VERSION \
   && install-stack gosu $GOSU_VERSION && . init-stack \
-  && python3 -m venv /workspace/.venv \
-  && source /workspace/.venv/bin/activate \
-  && pip3 install --disable-pip-version-check --no-cache-dir -r /workspace/requirements.txt \
-  && pip3 install --disable-pip-version-check --no-cache-dir -r /workspace/dev_requirements.txt \
-  && chown -R drycc:drycc /workspace \
+  && python3 -m venv ${DRYCC_HOME_DIR}/.venv \
+  && source ${DRYCC_HOME_DIR}/.venv/bin/activate \
+  && pip3 install --disable-pip-version-check --no-cache-dir -r ${DRYCC_HOME_DIR}/requirements.txt \
+  && pip3 install --disable-pip-version-check --no-cache-dir -r ${DRYCC_HOME_DIR}/dev_requirements.txt \
   # set env
-  && echo "source /workspace/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
+  && echo "source ${DRYCC_HOME_DIR}/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
   # cleanup
-  && scanelp /workspace/.venv/lib > runtime.txt \
+  && scanelp ${DRYCC_HOME_DIR}/.venv/lib > runtime.txt \
   && apt-get purge -y --auto-remove $buildDeps \
   && install-packages $(< runtime.txt) \
   && apt-get autoremove -y \
@@ -52,7 +46,7 @@ RUN buildDeps='gcc rustc cargo libffi-dev musl-dev libldap2-dev libsasl2-dev'; \
   && chown -R postgres:postgres /run/postgresql $PGDATA \
   && gosu postgres initdb -D $PGDATA
 
-COPY . /workspace
-WORKDIR /workspace
-CMD ["/workspace/bin/boot"]
+COPY . ${DRYCC_HOME_DIR}
+WORKDIR ${DRYCC_HOME_DIR}
+CMD ["bin/boot"]
 EXPOSE 8000