Merge branch 'main' into update-plugins-2025/07/08/08/32/18

gounthar · web-flow · commit 84e8927d83f2 · 2025-07-08T10:33:33.000+02:00
diff --git a/dockerfiles/agent-discovery/Dockerfile b/dockerfiles/agent-discovery/Dockerfile
@@ -1,7 +1,7 @@
 # This Dockerfile is used to prepare a Debian-based Docker image with several utilities installed.
 
 # We start from the Debian 'bookworm' image dated 2023-11-20.
-FROM debian:bookworm-20250610-slim as prepare-stage
+FROM debian:bookworm-20250630-slim as prepare-stage
 
 # Copy all shell scripts from the current directory to /usr/local/bin/ in the image.
 COPY *sh /usr/local/bin/
diff --git a/dockerfiles/dotnet/Dockerfile b/dockerfiles/dotnet/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.20.0-jdk21 AS ssh-agent
+FROM jenkins/ssh-agent:6.21.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 && \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM jenkins/ssh-agent:6.20.0-jdk21 AS ssh-agent`
	`1`	`+FROM jenkins/ssh-agent:6.21.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 && \`