Skip to content

Commit 3071fc9

Browse files
authored
Merge branch 'main' into dependabot/docker/dockerfiles/android/jenkins/ssh-agent-7.3.0-jdk21
2 parents d7b1c20 + c3889e2 commit 3071fc9

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

.github/workflows/anchore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: cd ./dockerfiles/ && docker build . --file Dockerfile --tag localbuild/testimage:latest
3939

4040
- name: Run the Anchore Grype scan action
41-
uses: anchore/scan-action@f6601287cdb1efc985d6b765bbf99cb4c0ac29d8
41+
uses: anchore/scan-action@a5605eb0943e46279cb4fbd9d44297355d3520ab
4242
id: scan
4343
with:
4444
path: "."

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:7.2.0-jdk21 AS ssh-agent
1+
FROM jenkins/ssh-agent:7.3.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 && \

dockerfiles/maven/Dockerfile

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

33
# ca-certificates because curl uses certificates from ca-certificates
44
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && apt-get clean && \

dockerfiles/multi/Dockerfile

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

33
ARG NODE_MAJOR=20
44

dockerfiles/node/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jenkins/ssh-agent:7.2.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.3.0-jdk21 as ssh-agent
22
ARG NODE_MAJOR=22
33

44
# ca-certificates because curl uses certificates from ca-certificates

0 commit comments

Comments
 (0)