Skip to content

Commit 5dba53a

Browse files
MaffoochMaffooch
authored
Merge pull request DefectDojo#8203 from DefectDojo/release/2.23.0
Release: Merge release into master from: release/2.23.0
2 parents 9e7ecf0 + 2b66802 commit 5dba53a

File tree

245 files changed

+30407
-4281
lines changed

Some content is hidden

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

245 files changed

+30407
-4281
lines changed

‎.flake8‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
[flake8]
22
# Documentation for flake8 http://flake8.pycqa.org/en/3.1.1/user/index.html
3+
4+
# we should not ignore these mistakes !!!!!!!!
5+
36
ignore =
47
# Suppress - line too long (> 79 characters)
58
E501

‎Dockerfile.django-alpine‎

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.11.3-alpine3.16@sha256:0ba61d06b14e5438aa3428ee46c7ccdc8df5b63483bc91ae050411407eb5cbf4 as base
8+
FROM python:3.11.3-alpine3.16@sha256:9efc6e155f287eb424ede74aeff198be75ae04504b1e42e87ec9f221e7410f2d as base
99
FROM base as build
1010
WORKDIR /app
1111
RUN \

‎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.11.3-slim-bullseye@sha256:286f2f1d6f2f730a44108656afb04b131504b610a6cb2f3413918e98dabba67e as base
8+
FROM python:3.11.3-slim-bullseye@sha256:eaee5f73efa9ae962d2077756292bc4878c04fcbc13dc168bb00cc365f35647e 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
@@ -1,7 +1,7 @@
11

22
# code: language=Dockerfile
33

4-
FROM python:3.11.3-slim-bullseye@sha256:286f2f1d6f2f730a44108656afb04b131504b610a6cb2f3413918e98dabba67e as build
4+
FROM python:3.11.3-slim-bullseye@sha256:eaee5f73efa9ae962d2077756292bc4878c04fcbc13dc168bb00cc365f35647e as build
55
WORKDIR /app
66
RUN \
77
apt-get -y update && \

‎Dockerfile.nginx-alpine‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.django-alpine to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.11.3-alpine3.16@sha256:0ba61d06b14e5438aa3428ee46c7ccdc8df5b63483bc91ae050411407eb5cbf4 as base
8+
FROM python:3.11.3-alpine3.16@sha256:9efc6e155f287eb424ede74aeff198be75ae04504b1e42e87ec9f221e7410f2d as base
99
FROM base as build
1010
WORKDIR /app
1111
RUN \
@@ -140,7 +140,7 @@ COPY manage.py ./
140140
COPY dojo/ ./dojo/
141141
RUN env DD_SECRET_KEY='.' python3 manage.py collectstatic --noinput && true
142142

143-
FROM nginx:1.23.4-alpine@sha256:dd2a9179765849767b10e2adde7e10c4ad6b7e4d4846e6b77ec93f080cd2db27
143+
FROM nginx:1.25.0-alpine@sha256:2e776a66a3556f001aba13431b26e448fe8acba277bf93d2ab1a785571a46d90
144144
ARG uid=1001
145145
ARG appuser=defectdojo
146146
COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/

‎Dockerfile.nginx-debian‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.django-debian to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.11.3-slim-bullseye@sha256:286f2f1d6f2f730a44108656afb04b131504b610a6cb2f3413918e98dabba67e as base
8+
FROM python:3.11.3-slim-bullseye@sha256:eaee5f73efa9ae962d2077756292bc4878c04fcbc13dc168bb00cc365f35647e as base
99
FROM base as build
1010
WORKDIR /app
1111
RUN \
@@ -75,7 +75,7 @@ COPY dojo/ ./dojo/
7575

7676
RUN env DD_SECRET_KEY='.' python3 manage.py collectstatic --noinput && true
7777

78-
FROM nginx:1.23.4-alpine@sha256:dd2a9179765849767b10e2adde7e10c4ad6b7e4d4846e6b77ec93f080cd2db27
78+
FROM nginx:1.25.0-alpine@sha256:2e776a66a3556f001aba13431b26e448fe8acba277bf93d2ab1a785571a46d90
7979
ARG uid=1001
8080
ARG appuser=defectdojo
8181
COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ git clone https://github.com/DefectDojo/django-DefectDojo
4848
cd django-DefectDojo
4949
# building
5050
./dc-build.sh
51-
# running (for other profiles besides mysql-rabbitmq look at https://github.com/DefectDojo/django-DefectDojo/blob/dev/readme-docs/DOCKER.md)
52-
./dc-up.sh mysql-rabbitmq
51+
# running (for other profiles besides postgres-redis look at https://github.com/DefectDojo/django-DefectDojo/blob/dev/readme-docs/DOCKER.md)
52+
./dc-up.sh postgres-redis
5353
# obtain admin credentials. the initializer can take up to 3 minutes to run
5454
# use docker-compose logs -f initializer to track progress
5555
docker-compose logs initializer | grep "Admin password:"

‎components/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.22.4",
3+
"version": "2.23.0",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {
@@ -25,7 +25,7 @@
2525
"font-awesome": "^4.0.0",
2626
"fullcalendar": "^3.10.2",
2727
"google-code-prettify": "^1.0.0",
28-
"jquery": "^3.6.4",
28+
"jquery": "^3.7.0",
2929
"jquery-highlight": "3.5.0",
3030
"jquery-ui": "1.13.2",
3131
"jquery.cookie": "1.4.1",

‎components/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -692,10 +692,10 @@ jquery.hotkeys@jeresig/jquery.hotkeys#master:
692692
version "0.2.0"
693693
resolved "https://codeload.github.com/jeresig/jquery.hotkeys/tar.gz/f24f1da275aab7881ab501055c256add6f690de4"
694694

695-
"jquery@>= 1.0.0", jquery@>=1.7, jquery@>=1.7.0, "jquery@>=1.8.0 <4.0.0", jquery@^3.6.4:
696-
version "3.6.4"
697-
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.4.tgz#ba065c188142100be4833699852bf7c24dc0252f"
698-
integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==
695+
"jquery@>= 1.0.0", jquery@>=1.7, jquery@>=1.7.0, "jquery@>=1.8.0 <4.0.0", jquery@^3.7.0:
696+
version "3.7.0"
697+
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.0.tgz#fe2c01a05da500709006d8790fe21c8a39d75612"
698+
integrity sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==
699699

700700
jszip@^3.10.1:
701701
version "3.10.1"

‎dc-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ fi
1212

1313
# Building images for all configurations
1414
# The docker build doesn't supply any environment variables to the Dockerfile, so we can use any profile.
15-
docker-compose --profile mysql-rabbitmq --profile postgres-redis --env-file ./docker/environments/mysql-rabbitmq.env build $1
15+
docker-compose --profile mysql-rabbitmq --profile postgres-redis --env-file ./docker/environments/postgres-redis.env build $1

0 commit comments

Comments
 (0)