Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix uwsgi crash on startup #4415

Merged
merged 4 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 1 addition & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/extensions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions src/openforms/conf/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
Loading