Merge branch 'main' into dependabot/docker/dockerfiles/python/jenkins/ssh-agent-6.20.0-jdk21

gounthar · web-flow · commit ba8595477df2 · 2025-07-01T10:33:24.000+02:00
diff --git a/dockerfiles/dotnet/Dockerfile b/dockerfiles/dotnet/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.19.0-jdk21 AS ssh-agent
+FROM jenkins/ssh-agent:6.20.0-jdk21 AS ssh-agent
 
 # install dotnet dependencies
 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 && \
diff --git a/dockerfiles/node/Dockerfile b/dockerfiles/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.19.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:6.20.0-jdk21 as ssh-agent
 ARG NODE_MAJOR=22
 
 # ca-certificates because curl uses certificates from ca-certificates
diff --git a/dockerfiles/plugins.txt b/dockerfiles/plugins.txt
@@ -45,7 +45,7 @@ mina-sshd-api-core:2.15.0-161.vb_200831a_c15b_
 okhttp-api:4.11.0-189.v976fa_d3379d6
 pipeline-build-step:571.v08a_fffd4b_0ce
 pipeline-graph-analysis:241.vc3d48fb_b_2582
-pipeline-graph-view:584.v32e797f976a_2
+pipeline-graph-view:588.v1efd7e219272
 pipeline-groovy-lib:752.vdddedf804e72
 pipeline-input-step:527.vd61b_1d3c5078
 pipeline-milestone-step:138.v78ca_76831a_43

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM jenkins/ssh-agent:6.19.0-jdk21 AS ssh-agent`
	`1`	`+FROM jenkins/ssh-agent:6.20.0-jdk21 AS ssh-agent`
`2`	`2`
`3`	`3`	`# install dotnet dependencies`
`4`	`4`	`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 && \`