Merge remote-tracking branch 'upstream/main'

Author: gounthar

build-docker-compose.yaml

@@ -63,7 +63,7 @@ services:
       timeout: 10s
       retries: 5
   default_agent:
-    image: jenkins/ssh-agent:6.12.0
+    image: jenkins/ssh-agent:6.12.0-jdk21
     container_name: desktop-jenkins_agent-1
     profiles:
       - default

docker-compose.yaml

@@ -111,7 +111,7 @@ services:
   # The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
   # The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
   default_agent:
-    image: jenkins/ssh-agent:6.12.0
+    image: jenkins/ssh-agent:6.12.0-jdk21
     container_name: desktop-jenkins_agent-1
     profiles:
       - default

dockerfiles/Dockerfile

@@ -2,9 +2,8 @@
 
 # We start by defining an ARG for the Jenkins version. This allows us to easily change the version of Jenkins we want to use.
 ARG JENKINS_VERSION=2.492.3
-
 # We then use the official Jenkins image with the specified version as our base image.
-FROM jenkins/jenkins:"${JENKINS_VERSION}"
+FROM jenkins/jenkins:"${JENKINS_VERSION}"-lts-jdk21
 
 # We switch to the root user to have the necessary permissions for the upcoming operations.
 USER root

dockerfiles/android/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.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

dockerfiles/cpp/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0
+FROM jenkins/ssh-agent:6.12.0-jdk21
 
 # Install necessary C++ build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \

dockerfiles/dotnet/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 AS ssh-agent
+FROM jenkins/ssh-agent:6.12.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 && \

dockerfiles/golang/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.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 ca-certificates curl && apt-get clean && \

dockerfiles/maven/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.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 ca-certificates curl && apt-get clean && \

dockerfiles/multi/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.0-jdk21 as ssh-agent
 
 ARG NODE_MAJOR=20
 

dockerfiles/node/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.12.0 as ssh-agent
+FROM jenkins/ssh-agent:6.12.0-jdk21 as ssh-agent
 ARG NODE_MAJOR=22
 
 # ca-certificates because curl uses certificates from ca-certificates