Merge branch 'main' into dependabot/docker/dockerfiles/agent-discovery/debian-bookworm-20250908-slim

gounthar · web-flow · commit ac0469b83bb2 · 2025-09-09T11:04:31.000+02:00
diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Run hadolint scanning on the controller Dockerfile
-        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        uses: hadolint/hadolint-action@3fc49fb50d59c6ab7917a2e4195dba633e515b29
         with:
           dockerfile: ./dockerfiles/Dockerfile
           format: sarif
@@ -42,7 +42,7 @@ jobs:
           no-fail: true
 
       - name: Run hadolint scanning on the maven Dockerfile
-        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        uses: hadolint/hadolint-action@3fc49fb50d59c6ab7917a2e4195dba633e515b29
         with:
           dockerfile: ./dockerfiles/maven/Dockerfile
           format: sarif
@@ -51,7 +51,7 @@ jobs:
           no-fail: true
 
       - name: Run hadolint scanning on the multibranch agent Dockerfile
-        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        uses: hadolint/hadolint-action@3fc49fb50d59c6ab7917a2e4195dba633e515b29
         with:
           dockerfile: ./dockerfiles/multi/Dockerfile
           format: sarif
@@ -60,7 +60,7 @@ jobs:
           no-fail: true
 
       - name: Run hadolint scanning on the node agent Dockerfile
-        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        uses: hadolint/hadolint-action@3fc49fb50d59c6ab7917a2e4195dba633e515b29
         with:
           dockerfile: ./dockerfiles/node/Dockerfile
           format: sarif
@@ -69,7 +69,7 @@ jobs:
           no-fail: true
 
       - name: Run hadolint scanning on the Python agent Dockerfile
-        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        uses: hadolint/hadolint-action@3fc49fb50d59c6ab7917a2e4195dba633e515b29
         with:
           dockerfile: ./dockerfiles/python/Dockerfile
           format: sarif
@@ -78,7 +78,7 @@ jobs:
           no-fail: true
 
       - name: Run hadolint scanning on the sidekick Dockerfile
-        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        uses: hadolint/hadolint-action@3fc49fb50d59c6ab7917a2e4195dba633e515b29
         with:
           dockerfile: ./dockerfiles/sidekick/Dockerfile
           format: sarif
@@ -87,7 +87,7 @@ jobs:
           no-fail: true
 
       - name: Run hadolint scanning on the Android Dockerfile
-        uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        uses: hadolint/hadolint-action@3fc49fb50d59c6ab7917a2e4195dba633e515b29
         with:
           dockerfile: ./dockerfiles/android/Dockerfile
           format: sarif
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
@@ -9,6 +9,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v6
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/updatecli.yaml b/.github/workflows/updatecli.yaml
@@ -23,7 +23,7 @@ jobs:
 
       # This step installs Updatecli in the runner using the updatecli-action
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.91.0
+        uses: updatecli/updatecli-action@v2.92.0
 
       # This step runs Updatecli in Dry Run mode
       # It uses the "diff" command of updatecli with the specified config and values files
diff --git a/build-docker-compose.yaml b/build-docker-compose.yaml
@@ -63,7 +63,7 @@ services:
       timeout: 10s
       retries: 5
   default_agent:
-    image: jenkins/ssh-agent:7.0.0-jdk21
+    image: jenkins/ssh-agent:7.1.0-jdk21
     container_name: desktop-jenkins_agent-1
     profiles:
       - default
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -121,7 +121,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:7.0.0-jdk21
+    image: jenkins/ssh-agent:7.1.0-jdk21
     container_name: desktop-jenkins_agent-1
     profiles:
       - default
diff --git a/dockerfiles/android/Dockerfile b/dockerfiles/android/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.0.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.1.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
diff --git a/dockerfiles/cpp/Dockerfile b/dockerfiles/cpp/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.0.0-jdk21
+FROM jenkins/ssh-agent:7.1.0-jdk21
 
 # Install necessary C++ build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/dockerfiles/golang/Dockerfile b/dockerfiles/golang/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.0.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.1.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 && \
diff --git a/dockerfiles/maven/Dockerfile b/dockerfiles/maven/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.0.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.1.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 && \
diff --git a/dockerfiles/multi/Dockerfile b/dockerfiles/multi/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.0.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.1.0-jdk21 as ssh-agent
 
 ARG NODE_MAJOR=20
 
diff --git a/dockerfiles/node/Dockerfile b/dockerfiles/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.0.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.1.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
@@ -34,7 +34,7 @@ javax-mail-api:1.6.2-11
 jaxb:2.3.9-133.vb_ec76a_73f706
 jjwt-api:0.11.5-120.v0268cf544b_89
 jquery3-api:3.7.1-594.vb_3864f326cf0
-junit:1354.v5b_348580de7f
+junit:1355.v45e2ea_65863c
 locale:597.v7781ce70d4cf
 mailer:522.va_995fa_cfb_8b_d
 matrix-auth:3.2.8
@@ -45,7 +45,7 @@ mina-sshd-api-core:2.16.0-167.va_269f38cc024
 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:628.va_6f6a_1d12848
+pipeline-graph-view:637.vb_6105ed84508
 pipeline-groovy-lib:752.vdddedf804e72
 pipeline-input-step:534.v352f0a_e98918
 pipeline-milestone-step:138.v78ca_76831a_43
diff --git a/dockerfiles/python/Dockerfile b/dockerfiles/python/Dockerfile
@@ -1,7 +1,7 @@
 # This Dockerfile is used to create a Jenkins SSH agent with Python and several Python packages installed in order to run the python sample tutorial.
 
 # We start from the Jenkins SSH agent image version 5.20.0.
-FROM jenkins/ssh-agent:7.0.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.1.0-jdk21 as ssh-agent
 
 # The RUN command executes a series of commands in the new layer of the image and commits the results.
 # The following commands are executed:
diff --git a/dockerfiles/sidekick/Dockerfile b/dockerfiles/sidekick/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-20250811 as prepare-stage
+FROM debian:bookworm-20250908 as prepare-stage
 
 # Copy all shell scripts from the current directory to /usr/local/bin/ in the image.
 COPY *sh /usr/local/bin/

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM jenkins/ssh-agent:7.0.0-jdk21 as ssh-agent`
	`1`	`+FROM jenkins/ssh-agent:7.1.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`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM jenkins/ssh-agent:7.0.0-jdk21`
	`1`	`+FROM jenkins/ssh-agent:7.1.0-jdk21`
`2`	`2`
`3`	`3`	`# Install necessary C++ build tools`
`4`	`4`	`RUN apt-get update && apt-get install -y --no-install-recommends \`