Skip to content

Commit 22a43b4

Browse files
authored
Merge pull request #14274 from DefectDojo/release/2.55.2
Release: Merge release into master from: release/2.55.2
2 parents f6476db + 727ac16 commit 22a43b4

File tree

146 files changed

+13440
-1129
lines changed

Some content is hidden

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

146 files changed

+13440
-1129
lines changed

.github/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ exclude-labels:
5555

5656
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
5757
template: |
58-
Please consult the [Upgrade notes in the documentation ](https://docs.defectdojo.com/en/open_source/upgrading/upgrading_guide/) for specific instructions for this release, and general upgrade instructions. Below is an automatically generated list of all PRs merged since the previous release.
58+
Please consult the [Upgrade notes in the documentation](https://docs.defectdojo.com/releases/os_upgrading/upgrading_guide/) for specific instructions for this release, and general upgrade instructions. Below is an automatically generated list of all PRs merged since the previous release.
5959
6060
## Changes since $PREVIOUS_TAG
6161
$CHANGES

.github/renovate.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"rebaseWhen": "conflicted",
99
"separateMinorPatch": true,
1010
"ignorePaths": [
11+
"docs/**",
1112
"requirements.txt",
1213
"requirements-lint.txt",
1314
"components/package.json",

Dockerfile.django-alpine

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ FROM base AS build
1010
WORKDIR /app
1111
RUN \
1212
apk update && \
13+
apk upgrade --no-cache && \
1314
apk add --no-cache \
1415
gcc \
1516
build-base \
@@ -40,6 +41,7 @@ ARG appuser=defectdojo
4041
ENV appuser=${appuser}
4142
RUN \
4243
apk update && \
44+
apk upgrade --no-cache && \
4345
apk add --no-cache \
4446
openjpeg \
4547
jpeg \

Dockerfile.django-debian

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ FROM base AS build
1010
WORKDIR /app
1111
RUN \
1212
apt-get -y update && \
13+
apt-get -y upgrade && \
1314
apt-get -y install --no-install-recommends \
1415
gcc \
1516
build-essential \
@@ -39,6 +40,7 @@ ARG appuser=defectdojo
3940
ENV appuser=${appuser}
4041
RUN \
4142
apt-get -y update && \
43+
apt-get -y upgrade && \
4244
# ugly fix to install postgresql-client without errors
4345
mkdir -p /usr/share/man/man1 /usr/share/man/man7 && \
4446
apt-get -y install --no-install-recommends \

Dockerfile.integration-tests-debian

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ FROM python:3.13.11-slim-trixie@sha256:51e1a0a317fdb6e170dc791bbeae63fac5272c82f
77
WORKDIR /app
88
RUN \
99
apt-get -y update && \
10+
apt-get -y upgrade && \
1011
apt-get -y install \
1112
git \
1213
wget \
@@ -20,6 +21,7 @@ RUN \
2021
xvfb \
2122
&& \
2223
apt-get clean && \
24+
rm -rf /var/lib/apt/lists && \
2325
true
2426

2527
RUN pip install --no-cache-dir selenium==4.9.0 requests

Dockerfile.nginx-alpine

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ FROM base AS build
1010
WORKDIR /app
1111
RUN \
1212
apk update && \
13+
apk upgrade --no-cache && \
1314
apk add --no-cache \
1415
gcc \
1516
build-base \
@@ -70,12 +71,14 @@ COPY --from=collectstatic /app/static/ /usr/share/nginx/html/static/
7071
COPY wsgi_params nginx/nginx.conf nginx/nginx_TLS.conf /etc/nginx/
7172
COPY docker/entrypoint-nginx.sh /
7273
RUN \
74+
apk upgrade --no-cache && \
7375
apk add --no-cache openssl && \
7476
chmod -R g=u /var/cache/nginx && \
7577
mkdir /var/run/defectdojo && \
7678
chmod -R g=u /var/run/defectdojo && \
7779
mkdir -p /etc/nginx/ssl && \
7880
chmod -R g=u /etc/nginx && \
81+
rm -rf /var/cache/apk/* && \
7982
true
8083
ENV \
8184
DD_UWSGI_PASS="uwsgi_server" \

components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "defectdojo",
3-
"version": "2.55.1",
3+
"version": "2.55.2",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {

docs/assets/images/RA_image1.png

207 KB

docs/assets/images/RA_image2.png

141 KB

docs/assets/images/RA_image3.png

87.6 KB

0 commit comments

Comments
 (0)