Skip to content

Commit 44c6fde

Browse files
authored
Merge branch 'weekly' into dependabot/github_actions/weekly/codacy/codacy-analysis-cli-action-4.4.7
2 parents cfa1133 + ef367b7 commit 44c6fde

5 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/workflows/anchore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747
severity-cutoff: critical
4848

4949
- name: Upload vulnerability report
50-
uses: github/codeql-action/upload-sarif@v3
50+
uses: github/codeql-action/upload-sarif@v4
5151
with:
5252
sarif_file: ${{ steps.scan.outputs.sarif }}

.github/workflows/codacy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ jobs:
5555

5656
# Upload the SARIF file generated in the previous step
5757
- name: Upload SARIF results file
58-
uses: github/codeql-action/upload-sarif@v3
58+
uses: github/codeql-action/upload-sarif@v4
5959
with:
6060
sarif_file: results.sarif

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
- name: Build and push a simple jenkins controller
121121
# This step builds and pushes a simple Jenkins controller
122122
if: (contains(env.files, 'dockerfiles/Dockerfile') || contains(env.files, 'dockerfiles/')) && env.IS_FORK == 'false'
123-
uses: docker/build-push-action@v6
123+
uses: docker/build-push-action@v7
124124
with:
125125
context: ./dockerfiles
126126
platforms: linux/amd64, linux/aarch64
@@ -130,7 +130,7 @@ jobs:
130130
- name: Build and push the jenkins agent for maven tutorial
131131
# This step builds and pushes the Jenkins agent for the Maven tutorial
132132
if: contains(env.files, 'dockerfiles/maven/Dockerfile') && env.IS_FORK == 'false'
133-
uses: docker/build-push-action@v6
133+
uses: docker/build-push-action@v7
134134
with:
135135
context: ./dockerfiles/maven
136136
platforms: linux/amd64, linux/aarch64
@@ -140,7 +140,7 @@ jobs:
140140
- name: Build and push the jenkins agent for python tutorial
141141
# This step builds and pushes the Jenkins agent for the Python tutorial
142142
if: contains(env.files, 'dockerfiles/python/Dockerfile') && env.IS_FORK == 'false'
143-
uses: docker/build-push-action@v6
143+
uses: docker/build-push-action@v7
144144
with:
145145
context: ./dockerfiles/python
146146
platforms: linux/amd64, linux/aarch64
@@ -150,7 +150,7 @@ jobs:
150150
- name: Build and push the jenkins agent for node tutorial
151151
# This step builds and pushes the Jenkins agent for the Node.js tutorial
152152
if: contains(env.files, 'dockerfiles/node/Dockerfile') && env.IS_FORK == 'false'
153-
uses: docker/build-push-action@v6
153+
uses: docker/build-push-action@v7
154154
with:
155155
context: ./dockerfiles/node
156156
platforms: linux/amd64, linux/aarch64
@@ -160,7 +160,7 @@ jobs:
160160
- name: Build and push the jenkins agent for the sidekick container
161161
# This step builds and pushes the Jenkins agent for the sidekick container
162162
if: contains(env.files, 'dockerfiles/sidekick/Dockerfile') && env.IS_FORK == 'false'
163-
uses: docker/build-push-action@v6
163+
uses: docker/build-push-action@v7
164164
with:
165165
context: ./dockerfiles/sidekick
166166
platforms: linux/amd64, linux/aarch64
@@ -170,7 +170,7 @@ jobs:
170170
- name: Build and push the jenkins agent for the agent-finding container
171171
# This step builds and pushes the Jenkins agent for the agent-finding container
172172
if: contains(env.files, 'dockerfiles/agent-discovery/Dockerfile') && env.IS_FORK == 'false'
173-
uses: docker/build-push-action@v6
173+
uses: docker/build-push-action@v7
174174
with:
175175
context: ./dockerfiles/agent-discovery/
176176
platforms: linux/amd64, linux/aarch64
@@ -180,7 +180,7 @@ jobs:
180180
- name: Build and push the jenkins agent for multi-branch controller
181181
# This step builds and pushes the Jenkins agent for the multi-branch controller
182182
if: contains(env.files, 'dockerfiles/multi/Dockerfile') && env.IS_FORK == 'false'
183-
uses: docker/build-push-action@v6
183+
uses: docker/build-push-action@v7
184184
with:
185185
context: ./dockerfiles/multi
186186
platforms: linux/amd64, linux/aarch64
@@ -190,7 +190,7 @@ jobs:
190190
- name: Build and push the jenkins agent for Android
191191
# This step builds and pushes the Jenkins agent for Android
192192
if: contains(env.files, 'dockerfiles/android/Dockerfile') && env.IS_FORK == 'false'
193-
uses: docker/build-push-action@v6
193+
uses: docker/build-push-action@v7
194194
with:
195195
context: ./dockerfiles/android
196196
platforms: linux/amd64
@@ -200,7 +200,7 @@ jobs:
200200
- name: Build and push the jenkins agent for golang tutorial
201201
# This step builds and pushes the Jenkins agent for the Golang tutorial
202202
if: contains(env.files, 'dockerfiles/golang/Dockerfile') && env.IS_FORK == 'false'
203-
uses: docker/build-push-action@v6
203+
uses: docker/build-push-action@v7
204204
with:
205205
context: ./dockerfiles/golang
206206
platforms: linux/amd64, linux/arm64
@@ -210,7 +210,7 @@ jobs:
210210
- name: Build and push the jenkins agent for cpp tutorial
211211
# This step builds and pushes the Jenkins agent for the C++ tutorial
212212
if: contains(env.files, 'dockerfiles/cpp/Dockerfile') && env.IS_FORK == 'false'
213-
uses: docker/build-push-action@v6
213+
uses: docker/build-push-action@v7
214214
with:
215215
context: ./dockerfiles/cpp
216216
platforms: linux/amd64, linux/aarch64
@@ -220,7 +220,7 @@ jobs:
220220
- name: Build and push the jenkins agent for dotnet tutorial
221221
# This step builds and pushes the Jenkins agent for the C++ tutorial
222222
if: contains(env.files, 'dockerfiles/dotnet/Dockerfile') && env.IS_FORK == 'false'
223-
uses: docker/build-push-action@v6
223+
uses: docker/build-push-action@v7
224224
with:
225225
context: ./dockerfiles/dotnet
226226
platforms: linux/amd64, linux/aarch64

.github/workflows/hadolint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
no-fail: true
9797

9898
- name: Upload analysis results to GitHub
99-
uses: github/codeql-action/upload-sarif@v3
99+
uses: github/codeql-action/upload-sarif@v4
100100
with:
101101
sarif_file: hadolint-results.sarif
102102
wait-for-processing: true

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-20260406-slim as prepare-stage
4+
FROM debian:bookworm-20260421-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/

0 commit comments

Comments
 (0)