Skip to content

Commit 7338c97

Browse files
rossopsrossops
authored
Merge pull request #13093 from DefectDojo/master-into-bugfix/2.50.0-2.51.0-dev
Release: Merge back 2.50.0 into bugfix from: master-into-bugfix/2.50.0-2.51.0-dev
2 parents 5c36d5f + 17f7d6b commit 7338c97

File tree

122 files changed

+974
-652
lines changed

Some content is hidden

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

122 files changed

+974
-652
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
os: [alpine, debian]
2525
platform: ["${{ inputs.platform }}"]
2626
exclude:
27+
- docker-image: nginx
28+
os: debian
2729
- docker-image: integration-tests
2830
os: alpine
2931
- docker-image: integration-tests
@@ -38,7 +40,7 @@ jobs:
3840
echo $GITHUB_ENV
3941
4042
- name: Checkout
41-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
43+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4244
with:
4345
persist-credentials: false
4446

‎.github/workflows/close-stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Close stale issues and PRs
19-
uses: actions/stale@v9
19+
uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
2020
with:
2121
# Disable automatic stale marking - only close manually labeled items
2222
days-before-stale: -1

‎.github/workflows/fetch-oas.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
file-type: [yaml, json]
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2626
with:
2727
ref: release/${{ env.release_version }}
2828

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ jobs:
1515
- name: Setup Hugo
1616
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
1717
with:
18-
hugo-version: '0.125.3'
18+
hugo-version: '0.140.1'
1919
extended: true
2020

2121
- name: Setup Node
2222
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2323
with:
24-
node-version: '22.18.0'
24+
node-version: '22.19.0'
2525

2626
- name: Cache dependencies
27-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
27+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
2828
with:
2929
path: ~/.npm
3030
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
3131
restore-keys: |
3232
${{ runner.os }}-node-
3333
3434
- name: Checkout
35-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3636
with:
3737
submodules: recursive
3838
fetch-depth: 0

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848

4949
steps:
5050
- name: Checkout
51-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
51+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5252

5353
# load docker images from build jobs
5454
- name: Load images from artifacts
55-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
55+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
5656
with:
5757
path: built-docker-image
5858
pattern: built-docker-image-*
@@ -61,7 +61,7 @@ jobs:
6161
- name: Load docker images
6262
timeout-minutes: 10
6363
run: |-
64-
docker load -i built-docker-image/nginx-${{ matrix.os }}-linux-amd64_img
64+
docker load -i built-docker-image/nginx-alpine-linux-amd64_img
6565
docker load -i built-docker-image/django-${{ matrix.os }}-linux-amd64_img
6666
docker load -i built-docker-image/integration-tests-debian-linux-amd64_img
6767
docker images
@@ -73,14 +73,14 @@ jobs:
7373
run: docker compose up --no-deps -d postgres nginx celerybeat celeryworker mailhog uwsgi redis
7474
env:
7575
DJANGO_VERSION: ${{ matrix.os }}
76-
NGINX_VERSION: ${{ matrix.os }}
76+
NGINX_VERSION: alpine
7777

7878
- name: Initialize
7979
timeout-minutes: 10
8080
run: docker compose up --no-deps --exit-code-from initializer initializer
8181
env:
8282
DJANGO_VERSION: ${{ matrix.os }}
83-
NGINX_VERSION: ${{ matrix.os }}
83+
NGINX_VERSION: alpine
8484

8585
- name: Integration tests
8686
timeout-minutes: 10

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
# are tested (https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html#available-versions)
2828
- databases: pgsql
2929
brokers: redis
30-
k8s: 'v1.30.3'
30+
k8s: 'v1.33.4'
3131
os: debian
3232
steps:
3333
- name: Checkout
34-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3535

3636
- name: Setup Minikube
3737
uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0
@@ -47,7 +47,7 @@ jobs:
4747
minikube status
4848
4949
- name: Load images from artifacts
50-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
50+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
5151
with:
5252
path: built-docker-image
5353
pattern: built-docker-image-*
@@ -57,8 +57,10 @@ jobs:
5757
timeout-minutes: 15
5858
run: |-
5959
eval $(minikube docker-env)
60-
docker load -i built-docker-image/nginx-${{ matrix.os }}-linux-amd64_img
60+
docker load -i built-docker-image/nginx-alpine-linux-amd64_img
6161
docker load -i built-docker-image/django-${{ matrix.os }}-linux-amd64_img
62+
docker tag defectdojo/defectdojo-nginx:alpine defectdojo/defectdojo-nginx:latest
63+
docker tag defectdojo/defectdojo-django:${{ matrix.os }} defectdojo/defectdojo-django:latest
6264
docker images
6365
6466
- name: Configure HELM repos
@@ -86,8 +88,7 @@ jobs:
8688
--set initializer.keepSeconds="-1" \
8789
${{ env[matrix.databases] }} \
8890
${{ env[matrix.brokers] }} \
89-
--set createSecret=true \
90-
--set tag=${{ matrix.os }}
91+
--set createSecret=true
9192
9293
- name: Check deployment status
9394
if: always()
@@ -124,7 +125,7 @@ jobs:
124125
while :
125126
do
126127
DJANGO_IP=$(kubectl get svc defectdojo-django -o jsonpath='{.spec.clusterIP}')
127-
OUT=$(kubectl run curl --quiet=true --image=curlimages/curl:7.73.0 \
128+
OUT=$(kubectl run curl --quiet=true --image=curlimages/curl:8.15.0 \
128129
--overrides='{ "apiVersion": "v1" }' \
129130
--restart=Never -i --rm -- \
130131
--silent \
@@ -155,7 +156,7 @@ jobs:
155156
ADMIN_PASS=$(kubectl get secret/defectdojo -o jsonpath='{.data.DD_ADMIN_PASSWORD}' | base64 -d)
156157
echo "Simple API check"
157158
DJANGO_IP=$(kubectl get svc defectdojo-django -o jsonpath='{.spec.clusterIP}')
158-
CR=$(kubectl run curl --quiet=true --image=curlimages/curl:7.73.0 \
159+
CR=$(kubectl run curl --quiet=true --image=curlimages/curl:8.15.0 \
159160
--overrides='{ "apiVersion": "v1" }' \
160161
--restart=Never -i --rm -- \
161162
--silent \

‎.github/workflows/plantuml.yml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎.github/workflows/release-1-create-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run: echo "GITHUB_ORG=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
4141

4242
- name: Checkout from_branch branch
43-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
43+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444
with:
4545
ref: ${{ inputs.from_branch }}
4646

@@ -58,7 +58,7 @@ jobs:
5858
run: git push origin HEAD:${NEW_BRANCH}
5959

6060
- name: Checkout release branch
61-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
61+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6262
with:
6363
ref: ${{ env.NEW_BRANCH }}
6464

‎.github/workflows/release-2-tag-docker-push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
22+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2323
with:
2424
ref: master
2525

‎.github/workflows/release-3-master-into-dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: echo "GITHUB_ORG=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
2424

2525
- name: Checkout master
26-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
26+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2727
with:
2828
ref: master
2929

@@ -40,7 +40,7 @@ jobs:
4040
run: git push origin HEAD:${NEW_BRANCH}
4141

4242
- name: Checkout new branch
43-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
43+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444
with:
4545
ref: ${{ env.NEW_BRANCH }}
4646

@@ -104,7 +104,7 @@ jobs:
104104
run: echo "GITHUB_ORG=${GITHUB_REPOSITORY%%/*}" >> $GITHUB_ENV
105105

106106
- name: Checkout master
107-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
107+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
108108
with:
109109
ref: master
110110

@@ -121,7 +121,7 @@ jobs:
121121
run: git push origin HEAD:${NEW_BRANCH}
122122

123123
- name: Checkout new branch
124-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
124+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
125125
with:
126126
ref: ${{ env.NEW_BRANCH }}
127127

0 commit comments

Comments
 (0)