Merge pull request #15361 from DefectDojo/release/3.1.300

Release: Merge release into master from: release/3.1.300

Author: rossops

.github/workflows/release-3-master-into-dev.yml

@@ -70,8 +70,8 @@ jobs:
           description: No special instructions.
           ---
           There are no special instructions for upgrading to $minorv.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/$patchv) for the contents of the release.
-          " > docs/content/en/open_source/upgrading/$minorv.md
-          git add docs/content/en/open_source/upgrading/$minorv.md
+          " > docs/content/releases/os_upgrading/$minorv.md
+          git add docs/content/releases/os_upgrading/$minorv.md
         if: endsWith(inputs.release_number_new, '.0') && endsWith(inputs.release_number_dev, '.0-dev')
 
       - name: Update values in HELM chart

Dockerfile.django-alpine

@@ -5,7 +5,7 @@
 # Dockerfile.nginx to use the caching mechanism of Docker.
 
 # Ref: https://devguide.python.org/#branchstatus
-FROM python:3.14.5-alpine3.22@sha256:6b91e66ab2a880ce9ca5a1b91c70f45963ff71ff68268df056336e1a657d5efd AS base
+FROM python:3.14.6-alpine3.23@sha256:b165067c5afc37fa5608a3c05609cc3d51aafd808a30fbfd822ee594fef55ad4 AS base
 FROM base AS build
 WORKDIR /app
 RUN \
@@ -15,7 +15,7 @@ RUN \
     gcc \
     build-base \
     bind-tools \
-    postgresql16-client \
+    postgresql18-client \
     xmlsec \
     git \
     util-linux \
@@ -49,7 +49,7 @@ RUN \
     xmlsec \
     git \
     util-linux \
-    postgresql16-client \
+    postgresql18-client \
     curl-dev \
     openssl \
     # needed for integration-tests

Dockerfile.django-debian

@@ -43,6 +43,15 @@ RUN \
   apt-get -y upgrade && \
   # ugly fix to install postgresql-client without errors
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 && \
+  # ca-certificates + curl are needed to fetch the PostgreSQL APT (PGDG) signing key
+  apt-get -y install --no-install-recommends ca-certificates curl && \
+  # Debian trixie only ships postgresql-client-17, but the bundled PostgreSQL
+  # server is 18. pg_dump refuses to dump a server newer than itself, which
+  # breaks `manage.py dbbackup`, so pull the matching v18 client from PGDG.
+  install -d /usr/share/postgresql-common/pgdg && \
+  curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc && \
+  echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt trixie-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+  apt-get -y update && \
   apt-get -y install --no-install-recommends \
     # libopenjp2-7 libjpeg62 are required by the pillow package
     libopenjp2-7 \
@@ -52,8 +61,9 @@ RUN \
     git \
     uuid-runtime \
     libpq-dev \
-    # only required for the dbshell (used by the initializer job)
-    postgresql-client \
+    # only required for the dbshell (used by the initializer job) and dbbackup;
+    # must match the server major version (18) for pg_dump to work
+    postgresql-client-18 \
     # libcurl4-openssl-dev is required for installing pycurl python package
     libcurl4-openssl-dev \
     && \

Dockerfile.nginx-alpine

@@ -5,7 +5,7 @@
 # Dockerfile.django-alpine to use the caching mechanism of Docker.
 
 # Ref: https://devguide.python.org/#branchstatus
-FROM python:3.14.5-alpine3.22@sha256:6b91e66ab2a880ce9ca5a1b91c70f45963ff71ff68268df056336e1a657d5efd AS base
+FROM python:3.14.6-alpine3.23@sha256:b165067c5afc37fa5608a3c05609cc3d51aafd808a30fbfd822ee594fef55ad4 AS base
 FROM base AS build
 WORKDIR /app
 RUN \
@@ -15,7 +15,7 @@ RUN \
     gcc \
     build-base \
     bind-tools \
-    postgresql16-client \
+    postgresql18-client \
     xmlsec \
     git \
     util-linux \

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "3.1.200",
+  "version": "3.1.300",
   "license": "BSD-3-Clause",
   "private": true,
   "dependencies": {