Merge branch 'main' of github.com:drycc/passport into main

Author: duanhongyi

rootfs/Dockerfile

@@ -12,14 +12,14 @@ RUN install-stack node $NODE_VERSION && . init-stack \
 
 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 \
+  PYTHON_VERSION="3.10.2"
 
 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 ${DRYCC_HOME_DIR}/requirements.txt
 
 RUN buildDeps='gcc rustc cargo libffi-dev musl-dev libldap2-dev libsasl2-dev'; \
@@ -28,7 +28,7 @@ RUN buildDeps='gcc rustc cargo libffi-dev musl-dev libldap2-dev libsasl2-dev'; \
   && 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} \
+  && chown -R ${DRYCC_UID}:${DRYCC_GID} ${DRYCC_HOME_DIR} \
   # set env
   && echo "source ${DRYCC_HOME_DIR}/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
   # cleanup
@@ -52,10 +52,10 @@ 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}
 
-USER drycc
+USER ${DRYCC_UID}
 
-COPY --chown=drycc:drycc . ${DRYCC_HOME_DIR}
-COPY --chown=drycc:drycc --from=build-app /web/dist ${DRYCC_HOME_DIR}/web/dist
+COPY --chown=${DRYCC_UID}:${DRYCC_GID} . ${DRYCC_HOME_DIR}
+COPY --chown=${DRYCC_UID}:${DRYCC_GID} --from=build-app /web/dist ${DRYCC_HOME_DIR}/web/dist
 
 WORKDIR ${DRYCC_HOME_DIR}
 CMD ["bin/boot"]

rootfs/Dockerfile.test

@@ -1,15 +1,14 @@
 FROM docker.io/drycc/base:bullseye
 
-ARG DRYCC_HOME_DIR=/workspace
-
-COPY requirements.txt ${DRYCC_HOME_DIR}/requirements.txt
-COPY dev_requirements.txt ${DRYCC_HOME_DIR}/dev_requirements.txt
-
-ENV PGDATA="/var/lib/postgresql/data" \
+ENV DRYCC_HOME_DIR=/workspace \
+  PGDATA="/var/lib/postgresql/data" \
   PYTHON_VERSION="3.10.2" \
   POSTGRES_VERSION="14.2" \
   GOSU_VERSION="1.14"
 
+COPY requirements.txt ${DRYCC_HOME_DIR}/requirements.txt
+COPY dev_requirements.txt ${DRYCC_HOME_DIR}/dev_requirements.txt
+
 RUN buildDeps='gcc rustc cargo libffi-dev musl-dev libldap2-dev libsasl2-dev'; \
   install-packages ldap-utils mercurial ca-certificates openssl git $buildDeps \
   && install-stack python $PYTHON_VERSION \