Merge branch 'dev' into locations-the-rest-of-the-owl

Author: dogboat

.github/workflows/release-x-manual-docker-containers.yml

@@ -52,7 +52,7 @@ jobs:
         run: echo "DOCKER_ORG=$(echo ${GITHUB_REPOSITORY%%/*} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
       - name: Login to DockerHub
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/release-x-manual-merge-container-digests.yml

@@ -48,7 +48,7 @@ jobs:
         merge-multiple: true
 
     - name: Login to DockerHub
-      uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+      uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/release-x-manual-tag-as-latest.yml

@@ -37,7 +37,7 @@ jobs:
       run: echo "DOCKER_ORG=$(echo ${GITHUB_REPOSITORY%%/*} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
     - name: Login to DockerHub
-      uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+      uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

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.13.11-alpine3.22@sha256:ab45bd32143151fe060d48218b91df43a289166e72ec7877823b1c972580bed3 AS base
+FROM python:3.13.11-alpine3.22@sha256:bd1f3d92303f436df1a1fcfda26063021d2f9e17979bb6d0dc92b0ba9fd430a2 AS base
 FROM base AS build
 WORKDIR /app
 RUN \

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.13.11-alpine3.22@sha256:ab45bd32143151fe060d48218b91df43a289166e72ec7877823b1c972580bed3 AS base
+FROM python:3.13.11-alpine3.22@sha256:bd1f3d92303f436df1a1fcfda26063021d2f9e17979bb6d0dc92b0ba9fd430a2 AS base
 FROM base AS build
 WORKDIR /app
 RUN \

docker-compose.yml

@@ -120,7 +120,7 @@ services:
           source: ./docker/extra_settings
           target: /app/docker/extra_settings
   postgres:
-    image: postgres:18.1-alpine@sha256:b40d931bd0e7ce6eecc59a5a6ac3b3c04a01e559750e73e7086b6dbd7f8bf545
+    image: postgres:18.1-alpine@sha256:30f2a9b6f470bece98c10f98952e720c881dc3ef987cf06b5ed4b698a350c1bb
     environment:
       POSTGRES_DB: ${DD_DATABASE_NAME:-defectdojo}
       POSTGRES_USER: ${DD_DATABASE_USER:-defectdojo}

docs/package-lock.json

@@ -22,7 +22,7 @@
     "@thulite/doks-core": "1.8.3",
     "@thulite/images": "3.3.4",
     "@thulite/inline-svg": "1.2.2",
-    "@thulite/seo": "2.4.2",
+    "@thulite/seo": "2.4.3",
     "thulite": "2.6.4"
   },
   "devDependencies": {

docs/package.json

@@ -0,0 +1,33 @@
+# Generated by Django 5.2.9 on 2026-01-14 09:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dojo', '0257_pghistory_tags_backfill'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='answer',
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name='choiceanswer',
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name='choicequestion',
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name='textanswer',
+            options={},
+        ),
+        migrations.AlterModelOptions(
+            name='textquestion',
+            options={},
+        ),
+    ]

dojo/db_migrations/0258_alter_answer_options_alter_choiceanswer_options_and_more.py

@@ -14,7 +14,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('dojo', '0257_pghistory_tags_backfill'),
+        ('dojo', '0258_alter_answer_options_alter_choiceanswer_options_and_more'),
         ('pghistory', '0007_auto_20250421_0444'),
     ]