Update deps

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

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
+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

sal/version.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>version</key>
-	<string>4.4.0.2311</string>
+	<string>4.4.1.2316</string>
 </dict>
 </plist>

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`
 

setup/requirements.txt

@@ -1,21 +1,20 @@
-Django==3.2.25
-django-bootstrap3==12.0.3
-django-debug-toolbar==3.2.1
-django-filter==2.4.0
-djangorestframework==3.11.2
-django-health-check==3.17.0
+Django==4.2.23
+django-bootstrap3==25.1
+django-filter==25.1
+djangorestframework==3.16.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
-six==1.14.0
-ulid2==0.2.0
-uritemplate==3.0.1
-urllib3==1.26.19
+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.3.0
+uritemplate==4.2.0
+urllib3==2.5.0
 Yapsy==1.12.2
-djangosaml2==0.18.1
+djangosaml2==1.11.1