Changes for python3.11 env, and Django 5.2

Author: root

Dockerfile

@@ -1,12 +1,22 @@
-# Use Python 3.9 as the base image
-FROM python:3.9-slim
+# Use Python 3.11 as the base image
+FROM python:3.11-slim
 
 # Define gosu version
 ARG GOSU_VERSION=1.16
 
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     gnupg2 \
+    xz-utils \
+    dpkg \
+    which \
+    sssd \
+    libpam0g-dev \
+    libsqlite3-dev \
+    libssl-dev \
+    python3-dev \
+    libldap2-dev \
+    default-libmysqlclient-dev \
     curl \
     lsb-release \
     ca-certificates \
@@ -52,10 +62,6 @@ RUN pip install --upgrade pip && \
     pip install wheel && \
     pip install -r requirements.txt
 
-# fix dep issues
-RUN sed -i '/from django.utils import timezone/a from pytz import utc\ntimezone.utc = utc' /opt/rcamp_venv/lib/python3.9/site-packages/ldapdb/models/fields.py
-RUN sed -i 's/from django.conf.urls import url/from django.urls import re_path as url/' /opt/rcamp_venv/lib/python3.9/site-packages/grappelli/urls.py
-
 # Clone and install the django-ldapdb-test-env repository
 WORKDIR /opt/rcamp
 

docker-compose.yml

@@ -1,27 +1,36 @@
 
 services:
   rcamp-uwsgi:
+    image: rcamp-uwsgi2
     build:
       context: .
     container_name: rcamp-uwsgi
-    command: ["python3", "manage.py", "runserver", "0.0.0.0:8000"]
+    hostname: ${HOSTNAME}
+    #command: ["python3", "manage.py", "runserver", "0.0.0.0:8000"]
     env_file:
-      - dev-environment.env
+      - .env
     environment:
       - UWSGI_UID=${UWSGI_UID}
       - UWSGI_GID=${UWSGI_GID}
     volumes:
       - ./rcamp:/opt/rcamp
       - ./ldapdb:/opt/ldapdb
-      - static-content:/opt/static
-      - media-uploads:/opt/media
-      - rcamp-logs:/opt/logs
-    ports:
-      - "80:8000"
-      - "5678:5678"  # Debugger port
+      - /var/lib/sss/pipes:/var/lib/sss/pipes:rw
+      - ./rcamp-pam/nsswitch.conf:/etc/nsswitch.conf
+      - ./rcamp-pam/pam.d:/etc/pam.d
+      - ./rcamp-pam/raddb:/etc/raddb  
+      - ./static-content:/opt/static
+      - ${MEDIA_DIR}:/opt/media
+      - ./rcamp-logs:/opt/logs
+#    ports:
+#      - "80:8000"
+#      - "443:443"
+      #- "5678:5678"  # Debugger port
     depends_on:
       database:
         condition: service_healthy
+    logging:
+      driver: syslog
 
   database:
     image: mysql:8.4
@@ -37,6 +46,26 @@ services:
       timeout: 5s
       retries: 5
 
+  nginx:
+    hostname: ${HOSTNAME}
+    image: nginx:1.20.0
+    container_name: nginx
+    volumes:
+      - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+      - ./nginx/uwsgi_params:/etc/nginx/uwsgi_params:ro
+      - ${SSL_CERT}:/etc/nginx/certs/rcamp.crt:ro
+      - ${SSL_KEY}:/etc/nginx/certs/rcamp.key:ro
+      - ${MEDIA_DIR}:/var/www/media:ro
+      - ./static-content:/var/www/static:ro
+      - ./nginx-logs:/var/logs/nginx
+    ports:
+      - "80:80"
+      - "443:443"
+    logging:
+      driver: syslog
+    depends_on:
+      - rcamp-uwsgi
+
 volumes:
   static-content:
   media-uploads:

requirements.txt

@@ -2,14 +2,14 @@ asgiref==3.8.1
 certifi==2025.1.31
 charset-normalizer==3.4.1
 debugpy==1.8.13
-Django==4.2.20
+Django==5.2
 django-auth-ldap==5.1.0
 django-crispy-forms==1.13.0
 django-easy-pjax==1.2.0
 django-extensions==3.2.3
 django-filter==22.1
 django-grappelli==4.0.1
-django-ldapdb @ git+https://github.com/django-ldapdb/django-ldapdb.git@eb9503c85cd230f45765ec8fcd9fc21dbc81ce4c
+django-ldapdb @ git+https://oauth2:glpat-T4wkcqXufHvA53DClNJp_W86MQp1OjE5CA.01.0y13pb1es@gitlab.rc.int.colorado.edu/rc-ops/django-ldap-rc.git@feature/python3.11-update
 django-material==1.11.3
 django-mysql==4.16.0
 django-utils==0.0.2
@@ -31,4 +31,4 @@ six==1.16.0
 sqlparse==0.5.3
 typing_extensions==4.12.2
 urllib3==2.3.0
-uWSGI==2.0.20
+uWSGI==2.0.31