Merge remote-tracking branch 'upstream/main'

Author: gounthar

.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.83.0
+        uses: updatecli/updatecli-action@v2.84.0
 
       # This step runs Updatecli in Dry Run mode
       # It uses the "diff" command of updatecli with the specified config and values files

.gitpod/Dockerfile

@@ -1,7 +1,7 @@
 # This Dockerfile is used to create a Gitpod workspace with GitHub CLI installed.
 
 # We start from the Gitpod full workspace image which includes a broad range of development tools.
-FROM gitpod/workspace-full:2025-05-09-11-18-24
+FROM gitpod/workspace-full:2025-06-04-16-54-45
 
 # The RUN command executes a series of commands in the new layer of the image and commits the results.
 # The following commands are executed:

README.md

@@ -68,4 +68,4 @@ Please let us know the following details when you open an issue:
 
 The tutorials have been tested with:
 - Docker version `28.0.4`
-- Docker Compose version `2.35.1`
+- Docker Compose version `2.36.0`

build-docker-compose.yaml

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

docker-compose.yaml

@@ -14,6 +14,8 @@ services:
     volumes:
       - agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /ssh-dir path inside the container
     # The healthcheck command checks if the conductor_ok file exists in the /ssh-dir directory.
+    networks:
+      - jenkins-net
     healthcheck:
       test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"]
       # Checks if the conductor_ok file exists in the /ssh-dir path
@@ -38,6 +40,8 @@ services:
       - dotnet
       - default
     # This service depends on the sidekick_service (generating SSH keys and JCasc token) completing successfully.
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -76,6 +80,10 @@ services:
       # Mounting the token as "container secret" makes it available in JCasc as the variable ${CASC_RELOAD_TOKEN}
       - ./secrets/jcasc_token:/run/secrets/CASC_RELOAD_TOKEN:ro
     # This service depends on the sidekick_service (generating SSH keys and JCasc token) completing successfully.
+    networks:
+      jenkins-net:
+        aliases:
+          - jenkins_controller # Add secondary alias
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -97,6 +105,8 @@ services:
       - empty_jenkins_home:/var/jenkins_home # Mounts the jenkins_home volume to the /var/jenkins_home path inside the container
       - agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /app path inside the container
     # This service depends on the sidekick_service (generating SSH keys and JCasc token) completing successfully.
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -111,10 +121,12 @@ 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.16.0-jdk21
+    image: jenkins/ssh-agent:6.18.0-jdk21
     container_name: desktop-jenkins_agent-1
     profiles:
       - default
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -133,6 +145,8 @@ services:
     container_name: desktop-jenkins_agent-1
     profiles:
       - wizard
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -145,6 +159,8 @@ services:
     container_name: desktop-jenkins_agent-1-maven
     profiles:
       - maven
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -163,6 +179,8 @@ services:
     container_name: desktop-jenkins_agent-1-python
     profiles:
       - python
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -183,6 +201,8 @@ services:
     container_name: desktop-jenkins_agent-1-node
     profiles:
       - node
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -205,6 +225,8 @@ services:
     container_name: desktop-jenkins_agent-1-android
     profiles:
       - android
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -227,6 +249,8 @@ services:
       - "8080:8080"
     profiles:
       - multi
+    networks:
+      - jenkins-net
     volumes:
       - jenkins_home:/var/jenkins_home # Mounts the jenkins_home volume to the /var/jenkins_home path inside the container
       - agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /app path inside the container
@@ -246,6 +270,8 @@ services:
     container_name: desktop-jenkins_agent-1-multi
     profiles:
       - multi
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -269,6 +295,8 @@ services:
     container_name: desktop-jenkins_agent-1-golang
     profiles:
       - golang
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -291,6 +319,8 @@ services:
     container_name: desktop-jenkins_agent-1
     profiles:
       - cpp
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -313,6 +343,8 @@ services:
     container_name: desktop-jenkins_agent-1
     profiles:
       - dotnet
+    networks:
+      - jenkins-net
     depends_on:
       sidekick_service:
         condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
@@ -333,3 +365,8 @@ volumes:
   empty_jenkins_home: null
   agent-ssh-dir:
     name: agent-ssh-dir # Creates a named volume called agent-ssh-dir
+
+networks:
+  jenkins-net:
+    driver: bridge
+    attachable: true

docker-versions.txt

@@ -1,2 +1,2 @@
 - Docker version 28.0.4, build b8034c0
-- Docker Compose version v2.35.1
+- Docker Compose version v2.36.0

dockerfiles/Dockerfile

@@ -1,7 +1,7 @@
 # This Dockerfile is used to create a Jenkins server with a specific version and pre-configured settings.
 
 # 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.504.1
+ARG JENKINS_VERSION=2.504.2
 # We then use the official Jenkins image with the specified version as our base image.
 FROM jenkins/jenkins:"${JENKINS_VERSION}"-lts-jdk21
 

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-20250428-slim as prepare-stage
+FROM debian:bookworm-20250520-slim as prepare-stage
 
 # Copy all shell scripts from the current directory to /usr/local/bin/ in the image.
 COPY *sh /usr/local/bin/

dockerfiles/android/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:6.16.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:6.18.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.16.0-jdk21
+FROM jenkins/ssh-agent:6.18.0-jdk21
 
 # Install necessary C++ build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \