chore(controller): set venv profile

Author: duanhongyi

charts/controller/templates/controller-cronjob-daily.yaml

@@ -37,7 +37,7 @@ spec:
               - /bin/bash
               - -c
             args:
-              - python /app/manage.py load_db_state_to_k8s
+              - python /workspace/manage.py load_db_state_to_k8s
             {{- include "controller.envs" . | indent 12 }}
           - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
             imagePullPolicy: {{.Values.pull_policy}}
@@ -46,7 +46,7 @@ spec:
               - /bin/bash
               - -c
             args:
-              - python -u /app/manage.py measure_apps
+              - python -u /workspace/manage.py measure_apps
             {{- include "controller.envs" . | indent 12 }}
           - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
             imagePullPolicy: {{.Values.pull_policy}}
@@ -55,7 +55,7 @@ spec:
               - /bin/bash
               - -c
             args:
-              - python -u /app/manage.py measure_resources
+              - python -u /workspace/manage.py measure_resources
             {{- include "controller.envs" . | indent 12 }}
           - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/controller:{{.Values.imageTag}}
             imagePullPolicy: {{.Values.pull_policy}}
@@ -64,6 +64,6 @@ spec:
               - /bin/bash
               - -c
             args:
-              - python -u /app/manage.py measure_volumes
+              - python -u /workspace/manage.py measure_volumes
             {{- include "controller.envs" . | indent 12 }}
 

charts/controller/templates/controller-cronjob-hourly.yaml

@@ -37,5 +37,5 @@ spec:
               - /bin/bash
               - -c
             args:
-              - python -u /app/manage.py measure_networks
+              - python -u /workspace/manage.py measure_networks
             {{- include "controller.envs" . | indent 12 }}

rootfs/Dockerfile

@@ -3,21 +3,24 @@ FROM docker.io/drycc/base:bullseye
 RUN adduser --system \
 	--shell /bin/bash \
 	--disabled-password \
-	--home /app \
+	--home /workspace \
 	--group \
 	drycc
 
 ENV PYTHON_VERSION="3.10.2"
-COPY requirements.txt /app/requirements.txt
+COPY requirements.txt /workspace/requirements.txt
 
 RUN buildDeps='gcc libffi-dev libpq-dev rustc cargo'; \
     install-packages $buildDeps \
   && install-stack python $PYTHON_VERSION && . init-stack \
-  && python3 -m venv /app/.venv \
-  && source /app/.venv/bin/activate \
-  && pip3 install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt \
+  && 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 \
+  # set env
+  && echo "source /workspace/.venv/bin/activate" >> /opt/drycc/python/profile.d/python.sh \
   # cleanup
-  && scanelp /app/.venv/lib > runtime.txt \
+  && scanelp /workspace/.venv/lib > runtime.txt \
   && apt-get purge -y --auto-remove $buildDeps \
   && install-packages $(< runtime.txt) \
   && apt-get autoremove -y \
@@ -37,9 +40,9 @@ RUN buildDeps='gcc libffi-dev libpq-dev rustc cargo'; \
         /usr/lib/`echo $(uname -m)`-linux-gnu/gconv/EBC* \
   && mkdir -p /usr/share/man/man{1..8}
 
-COPY . /app
+COPY . /workspace
 
 USER drycc
-WORKDIR /app
-CMD ["PATH=/app/.venv/bin:\$PATH", "/app/bin/boot"]
+WORKDIR /workspace
+CMD ["/workspace/bin/boot"]
 EXPOSE 8000

rootfs/Dockerfile.test

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

rootfs/bin/boot

@@ -13,24 +13,24 @@ echo system information:
 echo "Django Version: $(python manage.py --version)"
 python --version
 
-mkdir -p /app/data/logs
-chmod -R 777 /app/data/logs
+mkdir -p /workspace/data/logs
+chmod -R 777 /workspace/data/logs
 
 echo "Django checks:"
-python /app/manage.py check --deploy api
+python /workspace/manage.py check --deploy api
 
 echo ""
 echo "Health Checks:"
-python /app/manage.py healthchecks
+python /workspace/manage.py healthchecks
 
 echo ""
 echo "Database Migrations:"
-python /app/manage.py migrate --noinput
+python /workspace/manage.py migrate --noinput
 
 # spawn a gunicorn server in the background
 echo ""
 echo "Starting up Gunicorn"
-gunicorn -c /app/drycc/gunicorn/config.py api.wsgi &
+gunicorn -c /workspace/drycc/gunicorn/config.py api.wsgi &
 
 # smart shutdown on SIGTERM (SIGINT is handled by gunicorn)
 function on_exit() {

rootfs/bin/test-style

@@ -5,6 +5,5 @@
 
 # fail hard and fast even on pipelines
 set -eou pipefail
-# shellcheck disable=SC1091
-source /app/.venv/bin/activate
+
 flake8 --show-source

rootfs/bin/test-unit

@@ -5,8 +5,6 @@
 
 # fail hard and fast even on pipelines
 set -eou pipefail
-# shellcheck disable=SC1091
-source /app/.venv/bin/activate
 
 function start_redis() {
     cd /tmp

rootfs/bin/upload-coverage

@@ -5,7 +5,5 @@
 
 # fail hard and fast even on pipelines
 set -eou pipefail
-# shellcheck disable=SC1091
-source /app/.venv/bin/activate
 
 codecov --required