Skip to content

Commit 6c993e0

Browse files
Merge branch 'dev' into implement_n0s1
2 parents 28c3bef + 503399f commit 6c993e0

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

Dockerfile.integration-tests-debian

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

22
# code: language=Dockerfile
33

4-
FROM openapitools/openapi-generator-cli:v7.16.0@sha256:e56372add5e038753fb91aa1bbb470724ef58382fdfc35082bf1b3e079ce353c AS openapitools
4+
FROM openapitools/openapi-generator-cli:v7.17.0@sha256:868b97eb4e5080d2cdfd5b3eeaa4d52e4bbb7c56f14e234b08b0b0bc4f38a78f AS openapitools
55
# currently only supports x64, no arm yet due to chrome and selenium dependencies
66
FROM python:3.13.7-slim-trixie@sha256:5f55cdf0c5d9dc1a415637a5ccc4a9e18663ad203673173b8cda8f8dcacef689 AS build
77
WORKDIR /app

Dockerfile.nginx-alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ COPY dojo/ ./dojo/
6363
# always collect static for debug toolbar as we can't make it dependant on env variables or build arguments without breaking docker layer caching
6464
RUN env DD_SECRET_KEY='.' DD_DJANGO_DEBUG_TOOLBAR_ENABLED=True python3 manage.py collectstatic --noinput --verbosity=2 && true
6565

66-
FROM nginx:1.29.2-alpine3.22@sha256:61e01287e546aac28a3f56839c136b31f590273f3b41187a36f46f6a03bbfe22
66+
FROM nginx:1.29.3-alpine3.22@sha256:b3c656d55d7ad751196f21b7fd2e8d4da9cb430e32f646adcf92441b72f82b14
6767
ARG uid=1001
6868
ARG appuser=defectdojo
6969
COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ cvss==3.6
5656
django-fieldsignals==0.7.0
5757
hyperlink==21.0.0
5858
djangosaml2==1.11.1
59-
drf-spectacular==0.28.0
59+
drf-spectacular==0.29.0
6060
drf-spectacular-sidecar==2025.10.1
6161
django-ratelimit==4.1.0
6262
argon2-cffi==25.1.0

0 commit comments

Comments
 (0)