Skip to content

Commit 6f5811d

Browse files
authored
Merge branch 'weekly' into dependabot/github_actions/weekly/updatecli/updatecli-action-3.1.3
2 parents 250743b + 858c4e4 commit 6f5811d

10 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/anchore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Check out the code
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v6
3636

3737
- name: Build the Docker image
3838
run: cd ./dockerfiles/ && docker build . --file Dockerfile --tag localbuild/testimage:latest

.github/workflows/codacy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
# Checkout the repository to the GitHub Actions runner
3737
- name: Checkout code
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v6
3939

4040
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
4141
- name: Run Codacy Analysis CLI

.github/workflows/github-docker-registry-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Checkout
2828
# This step checks out the repository
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
3030
with:
3131
fetch-depth: 0
3232

@@ -84,7 +84,7 @@ jobs:
8484

8585
- name: Set up Docker Buildx
8686
# This step sets up Docker Buildx
87-
uses: docker/setup-buildx-action@v3
87+
uses: docker/setup-buildx-action@v4
8888

8989
-
9090
name: Login to GitHub Container Registry

.github/workflows/hadolint.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
3131
steps:
3232
- name: Checkout code
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v6
3434

3535
- name: Run hadolint scanning on the controller Dockerfile
36-
uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
36+
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
3737
with:
3838
dockerfile: ./dockerfiles/Dockerfile
3939
format: sarif
@@ -42,7 +42,7 @@ jobs:
4242
no-fail: true
4343

4444
- name: Run hadolint scanning on the maven Dockerfile
45-
uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
45+
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
4646
with:
4747
dockerfile: ./dockerfiles/maven/Dockerfile
4848
format: sarif
@@ -51,7 +51,7 @@ jobs:
5151
no-fail: true
5252

5353
- name: Run hadolint scanning on the multibranch agent Dockerfile
54-
uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
54+
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
5555
with:
5656
dockerfile: ./dockerfiles/multi/Dockerfile
5757
format: sarif
@@ -60,7 +60,7 @@ jobs:
6060
no-fail: true
6161

6262
- name: Run hadolint scanning on the node agent Dockerfile
63-
uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
63+
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
6464
with:
6565
dockerfile: ./dockerfiles/node/Dockerfile
6666
format: sarif
@@ -69,7 +69,7 @@ jobs:
6969
no-fail: true
7070

7171
- name: Run hadolint scanning on the Python agent Dockerfile
72-
uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
72+
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
7373
with:
7474
dockerfile: ./dockerfiles/python/Dockerfile
7575
format: sarif
@@ -78,7 +78,7 @@ jobs:
7878
no-fail: true
7979

8080
- name: Run hadolint scanning on the sidekick Dockerfile
81-
uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
81+
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
8282
with:
8383
dockerfile: ./dockerfiles/sidekick/Dockerfile
8484
format: sarif
@@ -87,7 +87,7 @@ jobs:
8787
no-fail: true
8888

8989
- name: Run hadolint scanning on the Android Dockerfile
90-
uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
90+
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5
9191
with:
9292
dockerfile: ./dockerfiles/android/Dockerfile
9393
format: sarif

.github/workflows/label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v5
12+
- uses: actions/labeler@v6
1313
with:
1414
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/plugin_update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919

2020
- name: Configure git & gh
2121
run: |

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
3030

3131
# Drafts your next Release notes as Pull Requests are merged into "master"
32-
- uses: release-drafter/release-drafter@v6
32+
- uses: release-drafter/release-drafter@v7
3333
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
3434
# with:
3535
# config-name: my-config.yml

.github/workflows/test-jenkins.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
BRANCH_SUFFIX: clean-up
2424
steps:
2525
- name: Checkout repository
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2727
with:
2828
fetch-depth: 0 # Fetch all history for all branches and tags.
2929

@@ -269,7 +269,7 @@ jobs:
269269

270270
steps:
271271
- name: Checkout repository
272-
uses: actions/checkout@v4
272+
uses: actions/checkout@v6
273273

274274
- name: Set up and start Docker Compose
275275
run: |

dockerfiles/agent-discovery/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile is used to prepare a Debian-based Docker image with several utilities installed.
22

33
# We start from the Debian 'bookworm' image dated 2023-11-20.
4-
FROM debian:bookworm-20250407-slim as prepare-stage
4+
FROM debian:bookworm-20260406-slim as prepare-stage
55

66
# Copy all shell scripts from the current directory to /usr/local/bin/ in the image.
77
COPY *sh /usr/local/bin/

dockerfiles/dotnet/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jenkins/ssh-agent:6.12.0-jdk21 AS ssh-agent
1+
FROM jenkins/ssh-agent:8.1.0-jdk21 AS ssh-agent
22

33
# install dotnet dependencies
44
RUN apt-get update && apt-get install -y --no-install-recommends libc6 libgcc1 libgssapi-krb5-2 libicu72 libssl3 libstdc++6 zlib1g wget && apt-get clean && \

0 commit comments

Comments
 (0)