-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updating to Django 5 and Ubuntu 24.04
- Loading branch information
1 parent
eef8fba
commit d0da7fb
Showing
3 changed files
with
54 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,22 @@ | ||
FROM ubuntu:22.04 | ||
FROM ubuntu:24.04 | ||
|
||
ENV PYTHONDONTWRITEBYTECODE 1 | ||
ENV PYTHONUNBUFFERED 1 | ||
|
||
RUN apt-get update && apt-get install -y tzdata && apt install -y python3.10 python3-pip python3-dev python3-numpy libpq-dev nginx libmysqlclient-dev build-essential libsasl2-dev libldap2-dev libssl-dev xmlsec1 gettext | ||
RUN apt-get update && apt-get install -y tzdata && apt install -y python3.12 python3-pip python3-dev python3.12-venv libpq-dev nginx libmysqlclient-dev pkg-config build-essential libsasl2-dev libldap2-dev libssl-dev xmlsec1 gettext git | ||
|
||
WORKDIR /opt/userportal | ||
|
||
COPY requirements.txt ./ | ||
|
||
RUN pip3 install --upgrade pip && \ | ||
pip3 install --no-cache-dir -r requirements.txt | ||
RUN python3 -m venv /opt/userportal-env && \ | ||
/opt/userportal-env/bin/pip install --upgrade pip && \ | ||
/opt/userportal-env/bin/pip install --no-cache-dir -r requirements.txt | ||
|
||
COPY . . | ||
|
||
RUN patch /usr/local/lib/python3.10/dist-packages/ldapdb/backends/ldap/base.py < /opt/userportal/ldapdb.patch | ||
RUN python3 manage.py collectstatic --noinput && python3 manage.py compilemessages | ||
RUN patch /opt/userportal-env/lib/python3.12/site-packages/ldapdb/backends/ldap/base.py < /opt/userportal/ldapdb.patch | ||
RUN /opt/userportal-env/bin/python manage.py collectstatic --noinput && /opt/userportal-env/bin/python manage.py compilemessages | ||
|
||
EXPOSE 8000 | ||
CMD ["./run-django-production.sh"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,56 +1,54 @@ | ||
asgiref==3.4.1 | ||
certifi==2024.07.04 | ||
cffi==1.15.1 | ||
chardet==4.0.0 | ||
charset-normalizer==3.3.1 | ||
cryptography==42.0.4 | ||
dateparser==1.0.0 | ||
asgiref==3.8.1 | ||
certifi==2024.7.4 | ||
cffi==1.16.0 | ||
charset-normalizer==3.3.2 | ||
contourpy==1.2.1 | ||
cryptography==42.0.8 | ||
cycler==0.12.1 | ||
dateparser==1.2.0 | ||
defusedxml==0.7.1 | ||
Django==3.2.25 | ||
django-auth-ldap==2.3.0 | ||
django-bootstrap-pagination==1.7.1 | ||
django-debug-toolbar==3.2.4 | ||
django-ldapdb==1.5.1 | ||
Django==5.0.7 | ||
django-bootstrap-pagination @ git+https://github.com/teejaydub/django-bootstrap-pagination@82ea7a213860a741890f324e025f6ec215f24a32 | ||
django-crispy-forms==2.2 | ||
django-debug-toolbar==4.4.6 | ||
django-ldapdb @ git+https://github.com/nikolaik/django-ldapdb@381e4f40032c96ea6ae6623a5a0339b3ea526ae5 | ||
django-settings-export==1.2.1 | ||
django-watchman==1.3.0 | ||
djangorestframework==3.13.1 | ||
djangorestframework-api-key==2.0.0 | ||
djangorestframework-datatables==0.7.0 | ||
djangosaml2==1.5.1 | ||
elementpath==2.4.0 | ||
flake8==3.9.0 | ||
djangorestframework==3.15.2 | ||
djangorestframework-datatables==0.7.2 | ||
djangosaml2==1.9.3 | ||
elementpath==4.4.0 | ||
flake8==7.1.0 | ||
fonttools==4.53.1 | ||
gunicorn==22.0.0 | ||
httmock==1.4.0 | ||
idna==3.7 | ||
importlib-metadata==3.7.3 | ||
importlib-resources==5.4.0 | ||
install==1.3.5 | ||
IPy==1.1 | ||
mccabe==0.6.1 | ||
mysqlclient==2.0.3 | ||
numpy==1.23.4 | ||
pandas==1.1.5 | ||
plotly==4.14.3 | ||
prometheus-api-client==0.4.2 | ||
pyasn1==0.4.8 | ||
pyasn1-modules==0.2.8 | ||
pycodestyle==2.7.0 | ||
pycparser==2.21 | ||
pyflakes==2.3.0 | ||
PyJWT==2.7.0 | ||
Pyment==0.3.3 | ||
kiwisolver==1.4.5 | ||
matplotlib==3.9.1 | ||
mccabe==0.7.0 | ||
mysqlclient==2.2.4 | ||
numpy==2.0.0 | ||
packaging==24.1 | ||
pandas==2.2.2 | ||
pillow==10.4.0 | ||
prometheus-api-client==0.5.5 | ||
pyasn1==0.6.0 | ||
pyasn1_modules==0.4.0 | ||
pycodestyle==2.12.0 | ||
pycparser==2.22 | ||
pyflakes==3.2.0 | ||
pyOpenSSL==24.1.0 | ||
pysaml2==7.1.2 | ||
python-dateutil==2.8.1 | ||
python-ldap==3.4.3 | ||
pytz==2021.1 | ||
PyYAML==6.0 | ||
regex==2020.11.13 | ||
pyparsing==3.1.2 | ||
pysaml2==7.5.0 | ||
python-dateutil==2.9.0.post0 | ||
python-ldap==3.4.4 | ||
pytz==2024.1 | ||
PyYAML==6.0.1 | ||
regex==2024.5.15 | ||
requests==2.32.3 | ||
retrying==1.3.3 | ||
six==1.15.0 | ||
six==1.16.0 | ||
sqlparse==0.5.0 | ||
typing-extensions==3.7.4.3 | ||
tzlocal==2.1 | ||
urllib3==1.26.19 | ||
xmlschema==1.9.2 | ||
zipp==3.19.1 | ||
tzdata==2024.1 | ||
tzlocal==5.2 | ||
urllib3==2.2.2 | ||
xmlschema==2.5.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters