chore(passport): upgrade requirements

Author: duanhongyi

rootfs/Dockerfile

@@ -3,7 +3,7 @@ FROM registry.drycc.cc/drycc/base:bullseye as build-app
 ADD web /web
 WORKDIR /web
 
-ENV NODE_VERSION="16.14.2"
+ENV NODE_VERSION="16.20.0"
 
 RUN install-stack node $NODE_VERSION && . init-stack \
   && npm install --global yarn \
@@ -15,7 +15,7 @@ FROM registry.drycc.cc/drycc/base:bullseye
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/workspace \
-  PYTHON_VERSION="3.10.4"
+  PYTHON_VERSION="3.10.11"
 
 RUN groupadd drycc --gid ${DRYCC_GID} \
   && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}

rootfs/Dockerfile.test

@@ -2,9 +2,9 @@ FROM registry.drycc.cc/drycc/base:bullseye
 
 ENV DRYCC_HOME_DIR=/workspace \
   PGDATA="/var/lib/postgresql/data" \
-  PYTHON_VERSION="3.10.4" \
-  POSTGRES_VERSION="14.2" \
-  GOSU_VERSION="1.14"
+  PYTHON_VERSION="3.10.11" \
+  POSTGRES_VERSION="14.5" \
+  GOSU_VERSION="1.16"
 
 COPY requirements.txt ${DRYCC_HOME_DIR}/requirements.txt
 COPY dev_requirements.txt ${DRYCC_HOME_DIR}/dev_requirements.txt

rootfs/api/utils.py

@@ -2,7 +2,6 @@
 Helper functions used by the Drycc Passport server.
 """
 import logging
-import six
 import datetime
 
 from django.utils.encoding import force_bytes
@@ -37,10 +36,7 @@ def __decorator(request, *args, **kwargs):
 
 class TokenGenerator(PasswordResetTokenGenerator):
     def _make_hash_value(self, user, timestamp):
-        return (
-            six.text_type(user.pk) + six.text_type(timestamp) +
-            six.text_type(user.is_active)
-        )
+        return f"{user.pk}{timestamp}{user.is_active}"
 
 
 token_generator = TokenGenerator()

rootfs/dev_requirements.txt

@@ -1,16 +1,13 @@
 # test module
 # test
 # Run "make test-unit" for the % of code exercised during tests
-coverage==5.3
+coverage==7.2.5
 
 # Run "make test-style" to check python syntax and style
-flake8==3.8.3
+flake8==3.9.2
 
 # code coverage report at https://codecov.io/github/drycc/passport
-codecov==2.1.9
+codecov==2.1.13
 
 # mock out python-requests, mostly k8s
-requests-mock==1.8.0
-
-# tail a log and pipe into tbgrep to find all tracebacks
-tbgrep==0.3.0
+requests-mock==1.10.0

rootfs/passport/gunicorn/config.py

@@ -5,7 +5,7 @@
 faulthandler.enable()
 
 bind = '0.0.0.0'
-workers = int(os.environ.get('GUNICORN_WORKERS', 4))
+workers = int(os.environ.get('GUNICORN_WORKERS', 2))
 worker_class = "uvicorn.workers.UvicornWorker"
 
 pythonpath = dirname(dirname(dirname(realpath(__file__))))

rootfs/requirements.txt

@@ -1,17 +1,16 @@
 # Drycc passport requirements
-django==4.1.2
-pytz==2022.2.1
-django-auth-ldap==3.0.0
-django-cors-headers==3.7.0
-djangorestframework==3.12.4
+django==4.2.1
+pytz==2023.3
+django-auth-ldap==4.3.0
+django-cors-headers==4.0.0
+djangorestframework==3.14.0
 gunicorn==20.1.0
-uvicorn==0.18.2
-asgiref==3.5.2
-psycopg2-binary==2.9.1
-requests==2.26.0
-requests-toolbelt==0.9.1
-django_redis==5.0.0
-dj-database-url==0.5.0
-django-oauth-toolkit==1.5.0
-whitenoise==5.3.0
-
+uvicorn==0.22.0
+asgiref==3.6.0
+psycopg[binary]==3.1.9
+requests==2.30.0
+requests-toolbelt==1.0.0
+django_redis==5.2.0
+dj-database-url==2.0.0
+django-oauth-toolkit==1.7.1
+whitenoise==6.4.0