Merge branch 'main' into update-plugins-2025/10/27/17/31/00

gounthar · web-flow · commit de36d5262e8f · 2025-10-28T06:43:05.000+01:00
diff --git a/dockerfiles/android/Dockerfile b/dockerfiles/android/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.3.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.4.0-jdk21 as ssh-agent
 
 # ca-certificates because curl uses certificates from ca-certificates
 RUN apt-get update && apt-get install -y --no-install-recommends adb build-essential ca-certificates curl file git python3 python3-pip unzip

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM jenkins/ssh-agent:7.3.0-jdk21 as ssh-agent`
	`1`	`+FROM jenkins/ssh-agent:7.4.0-jdk21 as ssh-agent`
`2`	`2`
`3`	`3`	`# ca-certificates because curl uses certificates from ca-certificates`
`4`	`4`	`RUN apt-get update && apt-get install -y --no-install-recommends adb build-essential ca-certificates curl file git python3 python3-pip unzip`