Merge branch 'main' into fix/docker-version-only-upgrade

gounthar · web-flow · commit 213de9de4d7e · 2026-02-25T10:54:50.000+01:00
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -8,7 +8,7 @@
       "dockerDashComposeVersion": "v2"
     },
     "ghcr.io/devcontainers/features/github-cli:1": {
-      "version": "2.83.2"
+      "version": "2.87.2"
     }
   },
 
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
@@ -10,7 +10,7 @@ echo "================================"
 
 # Install yq (YAML processor) - required for JCasc configuration
 echo "📦 Installing yq YAML processor..."
-YQ_VERSION="${YQ_VERSION:-v4.49.2}"
+YQ_VERSION="${YQ_VERSION:-v4.52.4}"
 YQ_URL="https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64"
 
 # Try wget first, fall back to curl if unavailable
diff --git a/.github/workflows/anchore.yml b/.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@40a61b52209e9d50e87917c5b901783d546b12d0
+        uses: anchore/scan-action@7037fa011853d5a11690026fb85feee79f4c946c
         id: scan
         with:
           path: "."
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.97.0
+        uses: updatecli/updatecli-action@v2.99.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.9.0-jdk21
+    image: jenkins/ssh-agent:7.14.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.9.0-jdk21
+    image: jenkins/ssh-agent:7.14.0-jdk21
     container_name: desktop-jenkins_agent-1
     profiles:
       - default
diff --git a/dockerfiles/Dockerfile b/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.528.3
+ARG JENKINS_VERSION=2.541.2
 # We then use the official Jenkins image with the specified version as our base image.
 FROM jenkins/jenkins:"${JENKINS_VERSION}"-lts-jdk21
 
diff --git a/dockerfiles/agent-discovery/Dockerfile b/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 'trixie' image.
-FROM debian:trixie-20251208-slim as prepare-stage
+FROM debian:trixie-20260202-slim as prepare-stage
 
 # Copy all shell scripts from the current directory to /usr/local/bin/ in the image.
 COPY *sh /usr/local/bin/
diff --git a/dockerfiles/android/Dockerfile b/dockerfiles/android/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.9.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.14.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
@@ -27,12 +27,12 @@ ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV ANDROID_SDK_ROOT /usr/local/android-sdk-linux
 ENV CMDLINE_TOOLS_HOME $ANDROID_HOME/cmdline-tools/latest
 ENV PATH /usr/local/bin:$PATH:$CMDLINE_TOOLS_HOME/bin:$ANDROID_HOME/:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
-ARG ANDROID_BUILD_TOOLS_VERSION=35.0.0
+ARG ANDROID_BUILD_TOOLS_VERSION=36.1.0
 
 RUN mkdir -p /usr/local/android-sdk-linux/cmdline-tools/latest && cd /usr/local/android-sdk-linux && \
-  curl -L -O  https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip && \
-  unzip -qq commandlinetools-linux-13114758_latest.zip -d tmp && mv tmp/cmdline-tools/* cmdline-tools/latest && \
-  rm -rf /usr/local/android-sdk-linux/commandlinetools-linux-13114758_latest.zip && \
+  curl -L -O  https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip && \
+  unzip -qq commandlinetools-linux-14742923_latest.zip -d tmp && mv tmp/cmdline-tools/* cmdline-tools/latest && \
+  rm -rf /usr/local/android-sdk-linux/commandlinetools-linux-14742923_latest.zip && \
   yes|/usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --licenses && \
   /usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --update && \
   /usr/local/android-sdk-linux/cmdline-tools/latest/bin/sdkmanager --list && \
diff --git a/dockerfiles/cpp/Dockerfile b/dockerfiles/cpp/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.9.0-jdk21
+FROM jenkins/ssh-agent:7.14.0-jdk21
 
 # Install necessary C++ build tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/dockerfiles/dotnet/Dockerfile b/dockerfiles/dotnet/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.9.0-jdk21 AS ssh-agent
+FROM jenkins/ssh-agent:7.14.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 && \
diff --git a/dockerfiles/golang/Dockerfile b/dockerfiles/golang/Dockerfile
@@ -1,11 +1,11 @@
-FROM jenkins/ssh-agent:7.9.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.14.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 && \
   rm -rf /var/lib/apt/lists/*
 
 # Now time to install golang
-ARG GOLANG_VERSION=1.25.5
+ARG GOLANG_VERSION=1.26.0
 ARG TARGETARCH
 ENV ARCHITECTURE=$TARGETARCH
 
diff --git a/dockerfiles/maven/Dockerfile b/dockerfiles/maven/Dockerfile
@@ -1,11 +1,11 @@
-FROM jenkins/ssh-agent:7.9.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.14.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 && \
   rm -rf /var/lib/apt/lists/*
 
 # Now time to install maven
-ARG MAVEN_VERSION=3.9.11
+ARG MAVEN_VERSION=3.9.12
 
 # Set SHELL flags for RUN commands to allow -e and pipefail
 # Rationale:https://github.com/hadolint/hadolint/wiki/DL4006
diff --git a/dockerfiles/multi/Dockerfile b/dockerfiles/multi/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:7.9.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.14.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.9.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.14.0-jdk21 as ssh-agent
 ARG NODE_MAJOR=24
 
 # ca-certificates because curl uses certificates from ca-certificates
diff --git a/dockerfiles/plugins.txt b/dockerfiles/plugins.txt
@@ -3,81 +3,81 @@ antisamy-markup-formatter:173.v680e3a_b_69ff3
 apache-httpcomponents-client-4-api:4.5.14-269.vfa_2321039a_83
 bootstrap5-api:5.3.8-895.v4d0d8e47fea_d
 bouncycastle-api:2.30.1.82-277.v70ca_0b_877184
-branch-api:2.1268.v044a_87612da_8
-build-timeout:1.38
+branch-api:2.1280.v0d4e5b_b_460ef
+build-timeout:1.39
 caffeine-api:3.2.3-194.v31a_b_f7a_b_5a_81
-checks-api:373.vfe7645102093
-cloudbees-folder:6.1073.va_7888eb_dd514
+checks-api:402.vca_263b_f200e3
+cloudbees-folder:6.1079.vc0975c2de294
 commons-lang3-api:3.20.0-109.ve43756e2d2b_4
 commons-text-api:1.15.0-210.v7480a_da_70b_9e
-configuration-as-code:2006.v001a_2ca_6b_574
-coverage:2.3060.v035a_5557cdb_c
-credentials-binding:702.vfe613e537e88
-credentials:1453.v9b_a_29777a_b_fd
+configuration-as-code:2037.v8e5349845172
+coverage:2.3139.v731d2e83ea_8a_
+credentials-binding:717.v951d49b_5f3a_a_
+credentials:1490.ve7532596f1fd
 display-url-api:2.217.va_6b_de84cc74b_
-durable-task:639.vefb_3d8372f6d
+durable-task:651.v1f5e074fc83f
 echarts-api:6.0.0-1165.vd1283a_3e37d4
 font-awesome-api:7.1.0-882.v1dfb_771e3278
-git-client:6.4.1
-git:5.8.1
+git-client:6.5.0
+git:5.10.0
 github-api:1.330-492.v3941a_032db_2a_
-github-branch-source:1917.v9ee8a_39b_3d0d
-github:1.45.0
-gradle:2.16.1149.v711b_998b_0532
+github-branch-source:1967.vdea_d580c1a_b_a_
+github:1.46.0
+gradle:2.18.1203.v2c96b_1243c72
 instance-identity:203.v15e81a_1b_7a_38
 ionicons-api:94.vcc3065403257
 jackson2-api:2.20.1-423.v13951f6b_6532
 jakarta-activation-api:2.1.4-1
 jakarta-mail-api:2.1.5-1
 javax-activation-api:1.2.0-8
 javax-mail-api:1.6.2-11
-jaxb:2.3.9-133.vb_ec76a_73f706
+jaxb:2.3.9-143.v5979df3304e6
 jjwt-api:0.11.5-120.v0268cf544b_89
 jquery3-api:3.7.1-619.vdb_10e002501a_
-junit:1369.v15da_00283f06
+junit:1396.v095840ed8491
 locale:614.va_6a_5a_1a_f2b_38
 mailer:525.v2458b_d8a_1a_71
 matrix-auth:3.2.9
 matrix-project:870.v9db_fcfc2f45b_
-metrics:4.2.37-489.vb_6db_69b_ce753
+metrics:4.2.37-494.v06f9a_939d33a_
 mina-sshd-api-common:2.16.0-167.va_269f38cc024
 mina-sshd-api-core:2.16.0-167.va_269f38cc024
 okhttp-api:4.12.0-195.vc02552c04ffd
-pipeline-build-step:571.v08a_fffd4b_0ce
-pipeline-graph-analysis:245.v88f03631a_b_21
-pipeline-graph-view:661.v6003f4542123
+pipeline-build-step:584.vdb_a_2cc3a_d07a_
+pipeline-graph-analysis:254.v0f63a_a_447dca_
+pipeline-graph-view:777.vdeb_113b_b_94da_
 pipeline-groovy-lib:787.ve2fef0efdca_6
 pipeline-input-step:540.v14b_100d754dd
 pipeline-milestone-step:138.v78ca_76831a_43
 pipeline-model-api:2.2277.v00573e73ddf1
 pipeline-model-definition:2.2277.v00573e73ddf1
 pipeline-model-extensions:2.2277.v00573e73ddf1
-pipeline-rest-api:2.38
+pipeline-rest-api:2.39
 pipeline-stage-step:322.vecffa_99f371c
 pipeline-stage-tags-metadata:2.2277.v00573e73ddf1
-pipeline-stage-view:2.38
+pipeline-stage-view:2.39
 plain-credentials:199.v9f8e1f741799
 plugin-util-api:6.1192.v30fe6e2837ff
 resource-disposer:0.25
-scm-api:724.v7d839074eb_5c
-script-security:1385.v7d2d9ec4d909
-snakeyaml-api:2.5-143.v93b_c004f89de
+scm-api:728.vc30dcf7a_0df5
+script-security:1399.ve6a_66547f6e1
+snakeyaml-api:2.5-149.v72471e9c6371
 ssh-credentials:361.vb_f6760818e8c
-ssh-slaves:3.1085.vc64d040efa_85
-sshd:3.374.v19b_d59ce6610
+ssh-slaves:3.1097.v868116049892
+sshd:3.384.vc89b_5e138cf9
 structs:362.va_b_695ef4fdf9
 timestamper:1.30
 token-macro:477.vd4f0dc3cb_cf1
 trilead-api:2.284.v1974ea_324382
 variant:70.va_d9f17f859e0
 workflow-aggregator:608.v67378e9d3db_1
-workflow-api:1384.vdc05a_48f535f
+workflow-api:1398.v67030756d3fb_
 workflow-basic-steps:1098.v808b_fd7f8cf4
-workflow-cps:4238.va_6fb_65c1f699
+workflow-cps:4256.v991a_f1991c03
 workflow-durable-task-step:1464.v2d3f5c68f84c
-workflow-job:1559.va_a_533730b_ea_d
+workflow-job:1571.vb_423c255d6d9
 workflow-multibranch:821.vc3b_4ea_780798
 workflow-scm-step:466.va_d69e602552b_
 workflow-step-api:710.v3e456cc85233
-workflow-support:1010.vb_b_39488a_9841
+workflow-support:1015.v785e5a_b_b_8b_22
 ws-cleanup:0.49
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.9.0-jdk21 as ssh-agent
+FROM jenkins/ssh-agent:7.14.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 'trixie' image.
-FROM debian:trixie-20251208 as prepare-stage
+FROM debian:trixie-20260202 as prepare-stage
 
 # Copy all shell scripts from the current directory to /usr/local/bin/ in the image.
 COPY *sh /usr/local/bin/
diff --git a/updatecli/updatecli.d/android.yaml b/updatecli/updatecli.d/android.yaml
@@ -14,17 +14,80 @@ scms:
       branch: "{{ .github.branch }}"
 
 sources:
+  # Uses Python stdlib to parse official Google SDK repository XML
+  # This is more reliable than shell pipelines with curl/grep/sed
   androidCommandLineTools:
     kind: shell
     spec:
-      command: 'curl -sL https://developer.android.com/studio | grep -oP "commandlinetools-linux-\K\d+(?=_latest\.zip)" | head -1'
+      command: |
+        python3 -c "
+        import xml.etree.ElementTree as ET
+        import urllib.request
+        import urllib.error
+        import re
+        import sys
+
+        try:
+            with urllib.request.urlopen('https://dl.google.com/android/repository/repository2-3.xml') as f:
+                tree = ET.parse(f)
+        except (urllib.error.URLError, urllib.error.HTTPError) as e:
+            print(f'Error fetching SDK repository: {e}', file=sys.stderr)
+            sys.exit(1)
+
+        found = False
+        for elem in tree.iter():
+            if elem.tag.endswith('url') and elem.text and 'commandlinetools-linux' in elem.text:
+                m = re.search(r'commandlinetools-linux-(\d+)_', elem.text)
+                if m:
+                    print(m.group(1))
+                    found = True
+                    break
+
+        if not found:
+            print('Error: No commandlinetools-linux version found', file=sys.stderr)
+            sys.exit(1)
+        "
       environments:
         - name: PATH
 
+  # Gets latest stable build-tools version (excludes release candidates)
   androidBuildTools:
     kind: shell
     spec:
-      command: 'curl -sL https://developer.android.com/tools/releases/build-tools | grep -oP "(\d+\.\d+\.\d+)" | grep "^35\." | head -1'
+      command: |
+        python3 -c "
+        import xml.etree.ElementTree as ET
+        import urllib.request
+        import urllib.error
+        import sys
+
+        try:
+            with urllib.request.urlopen('https://dl.google.com/android/repository/repository2-3.xml') as f:
+                tree = ET.parse(f)
+        except (urllib.error.URLError, urllib.error.HTTPError) as e:
+            print(f'Error fetching SDK repository: {e}', file=sys.stderr)
+            sys.exit(1)
+
+        versions = []
+        for elem in tree.iter():
+            if elem.tag.endswith('remotePackage'):
+                path = elem.get('path', '')
+                if path.startswith('build-tools;') and '-rc' not in path:
+                    versions.append(path.replace('build-tools;', ''))
+
+        if not versions:
+            print('Error: No stable build-tools versions found', file=sys.stderr)
+            sys.exit(1)
+
+        def version_key(v):
+            try:
+                return tuple(int(x) for x in v.split('.'))
+            except ValueError:
+                return (0,)  # Invalid versions sort to beginning
+
+        versions.sort(key=version_key)
+        print(versions[-1])
+        "
       environments:
         - name: PATH
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"dockerDashComposeVersion": "v2"`
`9`	`9`	`},`
`10`	`10`	`"ghcr.io/devcontainers/features/github-cli:1": {`
`11`		`- "version": "2.83.2"`
	`11`	`+ "version": "2.87.2"`
`12`	`12`	`}`
`13`	`13`	`},`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM jenkins/ssh-agent:7.9.0-jdk21`
	`1`	`+FROM jenkins/ssh-agent:7.14.0-jdk21`
`2`	`2`
`3`	`3`	`# Install necessary C++ build tools`
`4`	`4`	`RUN apt-get update && apt-get install -y --no-install-recommends \`