Skip to content

Commit fe38beb

Browse files
rossopsrossops
authored
Merge pull request #12542 from DefectDojo/release/2.47.0
Release: Merge release into master from: release/2.47.0
2 parents 6b30c45 + bc61e4c commit fe38beb

File tree

123 files changed

+1162
-1177
lines changed

Some content is hidden

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

123 files changed

+1162
-1177
lines changed

‎.github/workflows/build-docker-images-for-testing.yml‎

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

5252
- name: Build
5353
id: docker_build
54-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
54+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
5555
timeout-minutes: 15
5656
env:
5757
DOCKER_BUILD_CHECKS_ANNOTATIONS: false

‎.github/workflows/gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup Node
2222
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2323
with:
24-
node-version: '22.15.0'
24+
node-version: '22.16.0'
2525

2626
- name: Cache dependencies
2727
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3

‎.github/workflows/k8s-tests.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ env:
1111
--set createRedisSecret=true \
1212
"
1313
HELM_PG_DATABASE_SETTINGS: " \
14-
--set database=postgresql \
1514
--set postgresql.enabled=true \
1615
--set createPostgresqlSecret=true \
1716
"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
# we cannot set any tags here, those are set on the merged digest in release-x-manual-merge-container-digests.yml
6767
- name: Build and push images
6868
id: build
69-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
69+
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
7070
env:
7171
DOCKER_BUILD_CHECKS_ANNOTATIONS: false
7272
with:

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

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,21 @@ on:
2222
description: 'Release number'
2323
required: true
2424

25+
make_draft:
26+
type: boolean
27+
description: 'Mark as draft release?'
28+
default: true
29+
30+
make_prerelease:
31+
type: boolean
32+
description: 'Mark as pre-release?'
33+
default: false
34+
35+
make_latest:
36+
type: boolean
37+
description: 'Mark as latest?'
38+
default: false
39+
2540
jobs:
2641
release-chart:
2742
runs-on: ubuntu-latest
@@ -38,7 +53,7 @@ jobs:
3853
# id: get-upload-url
3954
# uses: pdamianik/[email protected]
4055
# with:
41-
# tag: ${{ github.event.inputs.release_number }}
56+
# tag: ${{ inputs.release_number }}
4257
# token: ${{ github.token }}
4358

4459
- name: Configure git
@@ -56,30 +71,31 @@ jobs:
5671
helm dependency update ./helm/defectdojo
5772
5873
- name: Add yq
59-
uses: mikefarah/yq@8bf425b4d1344db7cd469a8d10a390876e0c77fd # v4.45.1
74+
uses: mikefarah/yq@b534aa9ee5d38001fba3cd8fe254a037e4847b37 # v4.45.4
6075

6176
- name: Pin version docker version
6277
id: pin_image
6378
run: |-
6479
yq --version
65-
yq -i '.tag="${{ github.event.inputs.release_number }}"' helm/defectdojo/values.yaml
80+
yq -i '.tag="${{ inputs.release_number }}"' helm/defectdojo/values.yaml
6681
echo "Current image tag:`yq -r '.tag' helm/defectdojo/values.yaml`"
6782
6883
- name: Package Helm chart
6984
id: package-helm-chart
7085
run: |
7186
mkdir build
7287
helm package helm/defectdojo/ --destination ./build
73-
echo "chart_version=$(ls build | cut -d '-' -f 2 | sed 's|\.tgz||')" >> $GITHUB_ENV
88+
echo "chart_version=$(ls build | cut -d '-' -f 2,3 | sed 's|\.tgz||')" >> $GITHUB_ENV
7489
75-
- name: Create release ${{ github.event.inputs.release_number }}
90+
- name: Create release ${{ inputs.release_number }}
7691
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
7792
with:
78-
name: '${{ github.event.inputs.release_number }} 🌈'
79-
tag_name: ${{ github.event.inputs.release_number }}
93+
name: '${{ inputs.release_number }} 🌈'
94+
tag_name: ${{ inputs.release_number }}
8095
body: Run the release drafter to populate the release notes.
81-
draft: true
82-
prerelease: false
96+
draft: ${{ inputs.make_draft }}
97+
prerelease: ${{ inputs.make_prerelease }}
98+
make_latest: ${{ inputs.make_latest }}
8399
files: ./build/defectdojo-${{ env.chart_version }}.tgz
84100
token: ${{ secrets.GITHUB_TOKEN }}
85101
env:
@@ -96,9 +112,9 @@ jobs:
96112
git checkout helm-charts
97113
git pull
98114
if [ ! -f ./index.yaml ]; then
99-
helm repo index ./build --url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/releases/download/${{ github.event.inputs.release_number }}/"
115+
helm repo index ./build --url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/releases/download/${{ inputs.release_number }}/"
100116
else
101-
helm repo index ./build --url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/releases/download/${{ github.event.inputs.release_number }}/" --merge ./index.yaml
117+
helm repo index ./build --url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/releases/download/${{ inputs.release_number }}/" --merge ./index.yaml
102118
fi
103119
cp -f ./build/index.yaml ./index.yaml
104120
git add ./index.yaml

‎.github/workflows/release-x-nightly.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ jobs:
7777
uses: ./.github/workflows/release-x-manual-helm-chart.yml
7878
with:
7979
release_number: ${{ inputs.tag-to-apply }}
80+
make_draft: false
81+
make_prerelease: true
8082
secrets: inherit
81-

‎.github/workflows/validate_docs_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Node
1919
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2020
with:
21-
node-version: '22.15.0'
21+
node-version: '22.16.0'
2222

2323
- name: Cache dependencies
2424
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3

‎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.46.4",
3+
"version": "2.47.0",
44
"license" : "BSD-3-Clause",
55
"private": true,
66
"dependencies": {
@@ -35,7 +35,7 @@
3535
"metismenu": "~3.0.7",
3636
"moment": "^2.30.1",
3737
"morris.js": "morrisjs/morris.js",
38-
"pdfmake": "^0.2.19",
38+
"pdfmake": "^0.2.20",
3939
"startbootstrap-sb-admin-2": "1.0.7"
4040
},
4141
"engines": {

‎components/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -503,15 +503,15 @@ pako@~1.0.2:
503503
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
504504
integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
505505

506-
pdfmake@^0.2.19:
507-
version "0.2.19"
508-
resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.2.19.tgz#23d6862b395de95e41089263936f0ff806193ea7"
509-
integrity sha512-jVUILxOqAgcquxbGCz3Bo1/sGEuVLcReGYvo61oJ2EkkyfrlREd7TfLRF6jdF85aEQjxOj/6BD9uj0p+UfXNkw==
506+
pdfmake@^0.2.20:
507+
version "0.2.20"
508+
resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.2.20.tgz#a2e37114e46247c9a295df2fc1c7184942de567e"
509+
integrity sha512-bGbxbGFP5p8PWNT3Phsu1ZcRLnRfF6jmnuKTkgmt6i5PZzSdX6JaB+NeTz9q+aocfW8SE9GUjL3o/5GroBqGcQ==
510510
dependencies:
511511
"@foliojs-fork/linebreak" "^1.1.2"
512512
"@foliojs-fork/pdfkit" "^0.15.3"
513513
iconv-lite "^0.6.3"
514-
xmldoc "^2.0.0"
514+
xmldoc "^2.0.1"
515515

516516
png-js@^1.0.0:
517517
version "1.0.0"
@@ -625,9 +625,9 @@ util-deprecate@~1.0.1:
625625
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
626626
integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
627627

628-
xmldoc@^2.0.0:
629-
version "2.0.0"
630-
resolved "https://registry.yarnpkg.com/xmldoc/-/xmldoc-2.0.0.tgz#948b97c38f0cbc07b878985d14f9e2212127d42a"
631-
integrity sha512-6ZsqsqEkIKzWLqGyTN+j+ZRc/vxQHtnlHzSvj3JvM4XZPoZVJxj6fyz0XvwKAf1vh+kSN/HibO1/iJLf3F3LRw==
628+
xmldoc@^2.0.1:
629+
version "2.0.1"
630+
resolved "https://registry.yarnpkg.com/xmldoc/-/xmldoc-2.0.1.tgz#a901f6a6341e4d8cba3dbc5fc61017249f2adf24"
631+
integrity sha512-sOOqgsjl3PU6iBw+fBUGAkTCE+JFK+sBaOL3pnZgzqk2/yvOD7RlFmZtDRJAEBzdpOYxSXyOQH4mjubdfs3MSg==
632632
dependencies:
633633
sax "^1.2.4"

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ services:
105105
source: ./docker/extra_settings
106106
target: /app/docker/extra_settings
107107
postgres:
108-
image: postgres:17.4-alpine@sha256:7062a2109c4b51f3c792c7ea01e83ed12ef9a980886e3b3d380a7d2e5f6ce3f5
108+
image: postgres:17.5-alpine@sha256:f325a29ec9deb7039c5f07761d77d79d537dac836ecd99f982f6ca5476724604
109109
environment:
110110
POSTGRES_DB: ${DD_DATABASE_NAME:-defectdojo}
111111
POSTGRES_USER: ${DD_DATABASE_USER:-defectdojo}

0 commit comments

Comments
 (0)