Merge remote-tracking branch 'upstream/main'

Author: gounthar

.github/workflows/anchore.yml

@@ -38,7 +38,7 @@ jobs:
         run: cd ./dockerfiles/ && docker build . --file Dockerfile --tag localbuild/testimage:latest
 
       - name: Run the Anchore Grype scan action
-        uses: anchore/scan-action@7c05671ae9be166aeb155bad2d7df9121823df32
+        uses: anchore/scan-action@2c901ab7378897c01b8efaa2d0c9bf519cc64b9e
         id: scan
         with:
           path: "."

.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.82.0
+        uses: updatecli/updatecli-action@v2.83.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-04-16-08-49-20
+FROM gitpod/workspace-full:2025-05-09-11-18-24
 
 # 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

@@ -67,5 +67,5 @@ Please let us know the following details when you open an issue:
 - The version of docker compose you're using via the `docker compose version` command.
 
 The tutorials have been tested with:
-- Docker version `26.1.3`
-- Docker Compose version `2.27.1`
+- Docker version `28.0.4`
+- Docker Compose version `2.35.1`

build-docker-compose.yaml

@@ -63,7 +63,7 @@ services:
       timeout: 10s
       retries: 5
   default_agent:
-    image: jenkins/ssh-agent:6.14.0-jdk21
+    image: jenkins/ssh-agent:6.16.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.14.0-jdk21
+    image: jenkins/ssh-agent:6.16.0-jdk21
     container_name: desktop-jenkins_agent-1
     profiles:
       - default

docker-versions.txt

@@ -1,2 +1,2 @@
-- Docker version 26.1.3, build b72abbb
-- Docker Compose version v2.27.1
+- Docker version 28.0.4, build b8034c0
+- Docker Compose version v2.35.1

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.492.3
+ARG JENKINS_VERSION=2.504.1
 # We then use the official Jenkins image with the specified version as our base image.
 FROM jenkins/jenkins:"${JENKINS_VERSION}"-lts-jdk21
 

dockerfiles/android/Dockerfile

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