Skip to content

Commit f8f9eb8

Browse files
authored
Merge branch 'dev' into fix/helm-utf8-env
2 parents 0ac218d + 4028765 commit f8f9eb8

157 files changed

Lines changed: 4172 additions & 1419 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/close-stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Close issues and PRs that are pending closure
19-
uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
19+
uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
2020
with:
2121
# Disable automatic stale marking - only close manually labeled items
2222
days-before-stale: -1
@@ -27,7 +27,7 @@ jobs:
2727
close-pr-message: 'This PR has been automatically closed because it was manually labeled as stale. If you believe this was closed in error, please reopen it and remove the stale label.'
2828

2929
- name: Close stale issues and PRs
30-
uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
30+
uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
3131
with:
3232
# Disable automatic stale marking - only close manually labeled items
3333
days-before-stale: -1

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
extended: true
2323

2424
- name: Setup Node
25-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
25+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
2626
with:
2727
node-version: '24.18.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
2828

.github/workflows/pr-labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: "Autolabeler"
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0
18+
- uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0
1919
with:
2020
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2121
sync-labels: true

.github/workflows/release-x-manual-helm-chart.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
echo "chart_version=$(ls build | cut -d '-' -f 2,3 | sed 's|\.tgz||')" >> $GITHUB_ENV
7878
7979
- name: Create release ${{ inputs.release_number }}
80-
uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3.0.1
80+
uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228 # v3.0.2
8181
with:
8282
name: '${{ inputs.release_number }} 🌈'
8383
tag_name: ${{ inputs.release_number }}

.github/workflows/renovate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
uses: suzuki-shunsuke/github-action-renovate-config-validator@ee9f69e1f683ed0d08225086482b34fc9abe9300 # v2.1.0
2222
with:
2323
strict: "true"
24-
validator_version: 43.255.2 # renovate: datasource=github-releases depName=renovatebot/renovate
24+
validator_version: 43.263.3 # renovate: datasource=github-releases depName=renovatebot/renovate

.github/workflows/validate_docs_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
extended: true
1818

1919
- name: Setup Node
20-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
20+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
2121
with:
2222
node-version: '24.18.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
2323

@@ -42,7 +42,7 @@ jobs:
4242
run: cd docs && npm ci && hugo --minify --gc --config config/production/hugo.toml
4343

4444
- name: Check internal links
45-
uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2
45+
uses: lycheeverse/lychee-action@e7477775783ea5526144ba13e8db5eec57747ce8 # v2
4646
with:
4747
# --remap makes lychee resolve absolute docs.defectdojo.com URLs against
4848
# the freshly built site, so absURL-rendered links (e.g. nav menu items)

Dockerfile.django-debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.nginx to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.14.6-slim-trixie@sha256:b877e50bd90de10af8d82c57a022fc2e0dc731c5320d762a27986facfc3355c1 AS base
8+
FROM python:3.14.6-slim-trixie@sha256:d3400aa122fa42cf0af0dbe8ec3091b047eac5c8f7e3539f7135e86d855dc015 AS base
99
FROM base AS build
1010
WORKDIR /app
1111
RUN \

Dockerfile.integration-tests-debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
FROM openapitools/openapi-generator-cli:v7.23.0@sha256:5ffccd3b0d4ac57eac443e1c9b3e2f2bb7f0a21ffe6c6701f3690d7edc78bf2d AS openapitools
55
# currently only supports x64, no arm yet due to chrome and selenium dependencies
6-
FROM python:3.14.6-slim-trixie@sha256:b877e50bd90de10af8d82c57a022fc2e0dc731c5320d762a27986facfc3355c1 AS build
6+
FROM python:3.14.6-slim-trixie@sha256:d3400aa122fa42cf0af0dbe8ec3091b047eac5c8f7e3539f7135e86d855dc015 AS build
77
WORKDIR /app
88
RUN \
99
apt-get -y update && \

docker-compose.override.unit_tests.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ services:
2222
DD_DATABASE_USER: ${DD_DATABASE_USER:-defectdojo}
2323
DD_DATABASE_PASSWORD: ${DD_DATABASE_PASSWORD:-defectdojo}
2424
DD_CELERY_BROKER_URL: 'sqla+sqlite:///dojo.celerydb.sqlite'
25+
# No Redis/valkey in unit tests -> default django cache is LocMemCache.
26+
DD_CACHE_URL: ''
27+
# In-process singleton cache (dojo/caching.py) stays ON for deterministic
28+
# assertNumQueries counts; reset per request (middleware) and per test.
29+
DD_SETTINGS_CACHE_L1_TTL: '30'
2530
DD_JIRA_EXTRA_ISSUE_TYPES: 'Vulnerability' # Shouldn't trigger a migration error
2631
celerybeat: !reset
2732
celeryworker: !reset

docker-compose.override.unit_tests_cicd.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ services:
2323
DD_CELERY_BROKER_URL: 'sqla+sqlite:///dojo.celerydb.sqlite'
2424
DD_JIRA_EXTRA_ISSUE_TYPES: 'Vulnerability' # Shouldn't trigger a migration error
2525
DD_V3_FEATURE_LOCATIONS: ${DD_V3_FEATURE_LOCATIONS:-False}
26+
# No Redis/valkey in unit tests -> default django cache is LocMemCache.
27+
DD_CACHE_URL: ''
28+
# In-process singleton cache (dojo/caching.py) stays ON: a singleton is read
29+
# once per request/test (deterministic assertNumQueries), reset per request
30+
# (middleware) and per test (dojo_test_case setUp).
31+
DD_SETTINGS_CACHE_L1_TTL: '30'
2632
celerybeat: !reset
2733
celeryworker: !reset
2834
initializer: !reset

0 commit comments

Comments
 (0)