Merge pull request #4415 from open-formulieren/hotfix/uwsgi-crash

Fix uwsgi crash on startup

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Set up backend environment
         uses: maykinmedia/[email protected]
         with:
-          apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext postgresql-client gdal-bin'
+          apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gettext postgresql-client gdal-bin'
           python-version: '3.10'
           optimize-postgres: 'yes'
           pg-service: 'postgres'
@@ -142,7 +142,7 @@ jobs:
       - name: Set up backend environment
         uses: maykinmedia/[email protected]
         with:
-          apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext postgresql-client gdal-bin'
+          apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gettext postgresql-client gdal-bin'
           python-version: '3.10'
           optimize-postgres: 'yes'
           pg-service: 'postgres'
@@ -220,7 +220,7 @@ jobs:
       - name: Set up backend environment
         uses: maykinmedia/[email protected]
         with:
-          apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gettext postgresql-client gdal-bin'
+          apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gettext postgresql-client gdal-bin'
           python-version: '3.10'
           optimize-postgres: 'yes'
           pg-service: 'postgres'
@@ -291,7 +291,7 @@ jobs:
       - name: Set up backend environment
         uses: maykinmedia/[email protected]
         with:
-          apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gdal-bin'
+          apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gdal-bin'
           python-version: '3.10'
           setup-node: 'no'
           working-directory: 'open-forms'

.github/workflows/code_quality.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Set up backend environment
         uses: maykinmedia/[email protected]
         with:
-          apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gdal-bin'
+          apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gdal-bin'
           python-version: '3.10'
           setup-node: 'no'
       - uses: isort/[email protected]
@@ -48,7 +48,7 @@ jobs:
       - name: Set up backend environment
         uses: maykinmedia/[email protected]
         with:
-          apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gdal-bin'
+          apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gdal-bin'
           python-version: '3.10'
           setup-node: 'no'
       - name: Run black
@@ -64,7 +64,7 @@ jobs:
       - name: Set up backend environment
         uses: maykinmedia/[email protected]
         with:
-          apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gdal-bin'
+          apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gdal-bin'
           python-version: '3.10'
           setup-node: 'no'
       - name: Run flake8
@@ -107,7 +107,7 @@ jobs:
       - name: Set up backend environment
         uses: maykinmedia/[email protected]
         with:
-          apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gdal-bin'
+          apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gdal-bin'
           python-version: '3.10'
           setup-node: 'no'
       - name: Run manage.py makemigrations --check --dry-run

.github/workflows/sb.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Set up backend environment
         uses: maykinmedia/[email protected]
         with:
-          apt-packages: 'libxml2-dev libxmlsec1-dev libxmlsec1-openssl gdal-bin'
+          apt-packages: 'libxml2 libxmlsec1 libxmlsec1-openssl gdal-bin'
           python-version: '3.10'
           optimize-postgres: 'no'
           setup-node: 'yes'

Dockerfile

@@ -17,10 +17,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco
         python3-dev \
         libpq-dev \
         shared-mime-info \
-        # lxml deps
-        libxml2-dev \
-        libxslt-dev \
-        libxmlsec1-dev \
+        # lxml/xmlsec deps
         zlib1g-dev \
         libxmlsec1-openssl \
         # weasyprint deps, see https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#debian-11

requirements/base.txt

@@ -527,7 +527,7 @@ urllib3==2.2.2
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.23
+uwsgi==2.0.26
     # via -r requirements/base.in
 vine==5.1.0
     # via

requirements/ci.txt

@@ -1054,7 +1054,7 @@ urllib3==2.2.2
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.23
+uwsgi==2.0.26
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt

requirements/dev.txt

@@ -1222,7 +1222,7 @@ urllib3==2.2.2
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.23
+uwsgi==2.0.26
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt

requirements/extensions.txt

@@ -825,7 +825,7 @@ urllib3==2.2.2
     #   elastic-apm
     #   requests
     #   sentry-sdk
-uwsgi==2.0.23
+uwsgi==2.0.26
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt

src/openforms/conf/base.py

@@ -1031,6 +1031,9 @@
 # Access token required for performing the Token exchange
 OIDC_STORE_ACCESS_TOKEN = True
 
+# TODO: remove once 2.7 is released, this is required for data migration(s)
+MOZILLA_DJANGO_OIDC_DB_CACHE = "solo"
+
 #
 # Email / payment
 #