From b1902730646f608d7f4e44a67f62cdb22829e1b3 Mon Sep 17 00:00:00 2001 From: Graham Gilbert Date: Mon, 28 Jul 2025 11:03:38 -0700 Subject: [PATCH 1/2] Update base image and Django --- Dockerfile | 34 +++++++++++++++++----------------- Dockerfile-SAML | 5 ----- requirements.txt | 4 ++-- sal/version.plist | 2 +- set_build_no.sh | 2 +- setup/requirements.txt | 6 +++--- 6 files changed, 24 insertions(+), 29 deletions(-) delete mode 100644 Dockerfile-SAML diff --git a/Dockerfile b/Dockerfile index 01358d63..fb248116 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,23 @@ # Sal Dockerfile -FROM python:3.9.19-slim-bullseye +# FROM python:3.13.5-slim-bookworm +FROM python:3.11-slim-bookworm -ENV HOME /root -ENV DEBIAN_FRONTEND noninteractive -ENV APPNAME Sal -ENV APP_DIR /home/docker/sal -ENV DOCKER_SAL_TZ Europe/London -ENV DOCKER_SAL_ADMINS Docker User, docker@localhost -ENV DOCKER_SAL_LANG en-us -ENV DOCKER_SAL_DISPLAY_NAME Sal -ENV DOCKER_SAL_DEBUG false -ENV WAIT_FOR_POSTGRES false -ENV MAINT_FREQUENCY 300 -ENV LC_ALL en_US.UTF-8 -# ENV DOCKERIZE_VERSION v0.3.0 + +ENV HOME=/root +ENV DEBIAN_FRONTEND=noninteractive +ENV APPNAME=Sal +ENV APP_DIR=/home/docker/sal +ENV DOCKER_SAL_TZ=Europe/London +ENV DOCKER_SAL_ADMINS="Docker User, docker@localhost" +ENV DOCKER_SAL_LANG=en-us +ENV DOCKER_SAL_DISPLAY_NAME=Sal +ENV DOCKER_SAL_DEBUG=false +ENV WAIT_FOR_POSTGRES=false +ENV MAINT_FREQUENCY=300 +ENV LC_ALL=en_US.UTF-8 RUN apt-get update && \ + apt-get upgrade -y && \ mkdir -p /usr/share/man/man1 && \ mkdir -p /usr/share/man/man7 && \ apt-get install -y libc-bin && \ @@ -34,7 +36,7 @@ RUN apt-get update && \ curl \ libffi-dev \ libxmlsec1-dev \ - libxml2-dev \ + libxml2-dev \ xmlsec1 && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ @@ -71,8 +73,6 @@ RUN chmod 755 /run.sh && \ touch $APP_DIR/sal.log &&\ chmod 777 $APP_DIR/sal.log -#&& \ -#find . -name $APP_DIR/\*.pyc -delete WORKDIR $APP_DIR EXPOSE 8000 diff --git a/Dockerfile-SAML b/Dockerfile-SAML deleted file mode 100644 index 487243dc..00000000 --- a/Dockerfile-SAML +++ /dev/null @@ -1,5 +0,0 @@ -# Use a lightweight base image -FROM alpine:latest - -# Set the command to execute -CMD echo "This image is deprecated, use ghcr.io/salopensource/sal and set USE_SAML=True in your settings.py. See the README on https://github.com/salopensource/sal for more details." && exit 1 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 3752c718..8bbce4f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -r setup/requirements.txt gunicorn==22.0.0 psycopg2-binary==2.9.9 -gevent==24.2.1 -greenlet==3.0.3 +gevent==25.5.1 +greenlet==3.2.3 psycogreen==1.0.2 supervisor==4.2.4 django-iam-dbauth==0.1.4 diff --git a/sal/version.plist b/sal/version.plist index e9f8f150..a085f73a 100644 --- a/sal/version.plist +++ b/sal/version.plist @@ -3,6 +3,6 @@ version - 4.4.0.2311 + 4.4.1.2315 diff --git a/set_build_no.sh b/set_build_no.sh index 330b3b64..529bb889 100755 --- a/set_build_no.sh +++ b/set_build_no.sh @@ -1,6 +1,6 @@ #!/bin/bash -current_version="4.4.0" +current_version="4.4.1" pushd `dirname $0` > /dev/null SCRIPTPATH=`pwd` diff --git a/setup/requirements.txt b/setup/requirements.txt index 5ed1479f..3fcf7031 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,8 +1,8 @@ -Django==3.2.25 +Django==4.2.23 django-bootstrap3==12.0.3 django-debug-toolbar==3.2.1 django-filter==2.4.0 -djangorestframework==3.11.2 +djangorestframework==3.16.0 django-health-check==3.17.0 django-datatable-view==2.1.6 idna==3.7 @@ -13,7 +13,7 @@ python-dateutil==2.8.1 pytz==2019.3 PyYAML==6.0.1 requests==2.32.3 -six==1.14.0 +six==1.17.0 ulid2==0.2.0 uritemplate==3.0.1 urllib3==1.26.19 From 980b527dea812ae176d70c8307af377ca25d5f69 Mon Sep 17 00:00:00 2001 From: Graham Gilbert Date: Mon, 28 Jul 2025 11:20:24 -0700 Subject: [PATCH 2/2] Update the rest of the deps --- requirements.txt | 8 ++++---- sal/version.plist | 2 +- setup/requirements.txt | 29 ++++++++++++++--------------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8bbce4f0..8dc00269 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -r setup/requirements.txt -gunicorn==22.0.0 -psycopg2-binary==2.9.9 +gunicorn==23.0.0 +psycopg2-binary==2.9.10 gevent==25.5.1 greenlet==3.2.3 psycogreen==1.0.2 -supervisor==4.2.4 -django-iam-dbauth==0.1.4 +supervisor==4.2.5 +django-iam-dbauth==0.2.1 diff --git a/sal/version.plist b/sal/version.plist index a085f73a..45613c71 100644 --- a/sal/version.plist +++ b/sal/version.plist @@ -3,6 +3,6 @@ version - 4.4.1.2315 + 4.4.1.2316 diff --git a/setup/requirements.txt b/setup/requirements.txt index 3fcf7031..d5919069 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -1,21 +1,20 @@ Django==4.2.23 -django-bootstrap3==12.0.3 -django-debug-toolbar==3.2.1 -django-filter==2.4.0 +django-bootstrap3==25.1 +django-filter==25.1 djangorestframework==3.16.0 -django-health-check==3.17.0 +django-health-check==3.20.0 django-datatable-view==2.1.6 -idna==3.7 +idna==3.10 # Required for DRF -markdown==3.2.1 -netaddr==0.7.19 -python-dateutil==2.8.1 -pytz==2019.3 -PyYAML==6.0.1 -requests==2.32.3 +markdown==3.8.2 +netaddr==1.3.0 +python-dateutil==2.9.0.post0 +pytz==2025.2 +PyYAML==6.0.2 +requests==2.32.4 six==1.17.0 -ulid2==0.2.0 -uritemplate==3.0.1 -urllib3==1.26.19 +ulid2==0.3.0 +uritemplate==4.2.0 +urllib3==2.5.0 Yapsy==1.12.2 -djangosaml2==0.18.1 \ No newline at end of file +djangosaml2==1.11.1 \ No newline at end of file