docker versions update

.env

@@ -1,3 +1,3 @@
 GHCR_USERNAME=jenkins-docs
 IMAGE_PREFIX=ghcr.io
-BRANCH_SUFFIX=
+BRANCH_SUFFIX=weekly

.github/dependabot.yml

@@ -40,6 +40,11 @@ updates:
     open-pull-requests-limit: 10
   - package-ecosystem: docker
     directory: "./dockerfiles/sidekick"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10    
+  - package-ecosystem: docker
+    directory: "./dockerfiles/agent-discovery"
     schedule:
       interval: weekly
     open-pull-requests-limit: 10
@@ -52,4 +57,9 @@ updates:
     directory: "./dockerfiles/golang"
     schedule:
       interval: weekly
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 10
+  - package-ecosystem: docker
+    directory: "./dockerfiles/dotnet"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10

.github/labeler.yml

@@ -52,3 +52,9 @@ multi:
 github_actions:
   - changed-files:
       - any-glob-to-any-file: '/.github/workflows/*'
+
+
+# Add 'dotnet' label to any change to Dockerfile* files within the root dir
+dotnet:
+  - changed-files:
+      - any-glob-to-any-file: 'dockerfiles/dotnet/**'

.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@d43cc1dfea6a99ed123bf8f3133f1797c9b44492
+        uses: anchore/scan-action@7c05671ae9be166aeb155bad2d7df9121823df32
         id: scan
         with:
           path: "."

.github/workflows/github-docker-registry-push.yml

@@ -204,3 +204,23 @@ jobs:
           platforms: linux/amd64, linux/arm64
           push: true
           tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:golang_${{ env.BRANCH }}
+
+      - name: Build and push the jenkins agent for cpp tutorial
+        # This step builds and pushes the Jenkins agent for the C++ tutorial
+        if: contains(env.files, 'dockerfiles/cpp/Dockerfile')
+        uses: docker/build-push-action@v6
+        with:
+          context: ./dockerfiles/cpp
+          platforms: linux/amd64, linux/aarch64
+          push: true
+          tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:cpp_${{ env.BRANCH }}
+
+      - name: Build and push the jenkins agent for dotnet tutorial
+        # This step builds and pushes the Jenkins agent for the C++ tutorial
+        if: contains(env.files, 'dockerfiles/dotnet/Dockerfile')
+        uses: docker/build-push-action@v6
+        with:
+          context: ./dockerfiles/dotnet
+          platforms: linux/amd64, linux/aarch64
+          push: true
+          tags: ghcr.io/${{ env.REPO_NAME }}/jenkinsci-tutorials:dotnet_${{ env.BRANCH }}

.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.62.0
+        uses: updatecli/updatecli-action@v2.82.0
 
       # This step runs Updatecli in Dry Run mode
       # It uses the "diff" command of updatecli with the specified config and values files
@@ -37,7 +37,7 @@ jobs:
       # It uses the "apply" command of updatecli with the specified config and values files
       # The GitHub token is passed as an environment variable
       - name: Run Updatecli in Apply mode
-        if: github.ref == 'refs/heads/main'
+        if: github.ref == 'refs/heads/weekly'
         run: updatecli apply --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml
         env:
           UPDATECLI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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:2024-07-14-17-19-51
+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:

build-docker-compose.yaml

@@ -25,6 +25,7 @@ services:
       - android
       - multi
       - golang
+      - dotnet
       - default
     # This service depends on the sidekick_service (generating SSH keys and JCasc token) completing successfully.
     depends_on:
@@ -62,7 +63,7 @@ services:
       timeout: 10s
       retries: 5
   default_agent:
-    image: jenkins/ssh-agent:5.44.0
+    image: jenkins/ssh-agent:6.16.0-jdk21
     container_name: desktop-jenkins_agent-1
     profiles:
       - default
@@ -205,6 +206,42 @@ services:
       retries: 5
     volumes:
       - agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
+  cpp:
+    build: dockerfiles/cpp/.
+    container_name: desktop-jenkins_agent-1-cpp
+    profiles:
+      - cpp
+    depends_on:
+      sidekick_service:
+        condition: service_completed_successfully
+      jenkins_controller:
+        condition: service_started
+    healthcheck:
+      test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
+      interval: 5s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - agent-ssh-dir:/home/jenkins/.ssh:ro
+  dotnet:
+    build: dockerfiles/dotnet/.
+    container_name: desktop-jenkins_agent-1-dotnet
+    profiles:
+      - dotnet
+    depends_on:
+      sidekick_service:
+        condition: service_completed_successfully
+      jenkins_controller:
+        condition: service_started
+    ports:
+      - "5000:5000"
+    healthcheck:
+      test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
+      interval: 5s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - agent-ssh-dir:/home/jenkins/.ssh:ro
 volumes:
   jenkins_home: null
   agent-ssh-dir:

docker-compose.yaml

@@ -35,6 +35,7 @@ services:
       - android
       - multi
       - golang
+      - dotnet
       - default
     # This service depends on the sidekick_service (generating SSH keys and JCasc token) completing successfully.
     depends_on:
@@ -59,8 +60,9 @@ services:
       - python
       - node
       - android
-      - multi
       - golang
+      - cpp
+      - dotnet
       - default
     # The CASC_RELOAD_TOKEN environment variable is used by the Jenkins controller to restart the Configuration as Code (JCasc) plugin configuration.
     environment:
@@ -109,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:5.44.0
+    image: jenkins/ssh-agent:6.16.0-jdk21
     container_name: desktop-jenkins_agent-1
     profiles:
       - default
@@ -282,6 +284,50 @@ services:
       retries: 5
     volumes:
       - agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
+  cpp:
+    image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:cpp_${BRANCH_SUFFIX}
+    environment:
+      - GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
+    container_name: desktop-jenkins_agent-1
+    profiles:
+      - cpp
+    depends_on:
+      sidekick_service:
+        condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
+      jenkins_controller:
+        condition: service_started
+    ports:
+      - "3000:3000"
+    healthcheck:
+      test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
+      # Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
+      interval: 5s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
+  dotnet:
+    image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:dotnet_${BRANCH_SUFFIX}
+    environment:
+      - GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
+    container_name: desktop-jenkins_agent-1
+    profiles:
+      - dotnet
+    depends_on:
+      sidekick_service:
+        condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
+      jenkins_controller:
+        condition: service_started
+    ports:
+      - "5000:5000"
+    healthcheck:
+      test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
+      # Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
+      interval: 5s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
 volumes:
   jenkins_home: null
   empty_jenkins_home: null

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.452.3
+ARG JENKINS_VERSION=2.509-jdk21
 
 # We then use the official Jenkins image with the specified version as our base image.
 FROM jenkins/jenkins:"${JENKINS_VERSION}"
@@ -25,11 +25,11 @@ USER jenkins
 RUN echo "${JENKINS_VERSION}" > /usr/share/jenkins/ref/jenkins.install.UpgradeWizard.state
 
 # We copy a list of plugins to install to the Jenkins ref directory in the image.
-COPY plugins.txt /usr/share/jenkins/ref/plugins.txt
+COPY plugins.txt /usr/share/jenkins/ref/plugins.txt.override
 
 # We use the Jenkins plugin CLI to install the plugins listed in the plugins.txt file.
-RUN jenkins-plugin-cli --plugin-file /usr/share/jenkins/ref/plugins.txt
+RUN ln -s /usr/share/jenkins/ref/plugins.txt.override /usr/share/jenkins/ref/plugins.txt && jenkins-plugin-cli --plugin-file /usr/share/jenkins/ref/plugins.txt
 
 # We copy a pre-configured Jenkins configuration file to the Jenkins ref directory in the image.
 # This allows us to pre-configure Jenkins with our desired settings.
-COPY jenkins.yaml /usr/share/jenkins/ref/jenkins.yaml
+COPY jenkins.yaml /usr/share/jenkins/ref/jenkins.yaml.override

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-20240311-slim as prepare-stage
+FROM debian:bookworm-20250407-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/agent-discovery/find-name.sh

@@ -79,15 +79,31 @@ while true; do
   sleep 2  # Wait for 5 seconds before the next iteration of the loop.
 done
 
+## Check if jenkins_controller is reachable, otherwise fall back to multi_jenkins_controller
+JENKINS_CONTROLLER="jenkins_controller"
+if ! curl -s -f --max-time 60 "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
+    echo "Primary controller not reachable, falling back to multi controller..."
+    JENKINS_CONTROLLER="multi_jenkins_controller"
+    if ! curl -s -f --max-time 60 "http://${JENKINS_CONTROLLER}:8080/login" > /dev/null; then
+        echo "Error: Neither primary nor multi controller is reachable"
+        exit 1
+    fi
+fi
+
 # Check If Jenkins is running or not
 # If the message is found, awk exits with a non-zero status (1), and the loop continues.
 # If the message is not found, the loop exits, and the "Jenkins is running" message is displayed.
-timeout 60 bash -c 'until curl -s -f http://jenkins_controller:8080/login > /dev/null; do sleep 5; done' && echo "Jenkins is running" || echo "Jenkins is not running"
+timeout 60 bash -c "until curl -s -f http://${JENKINS_CONTROLLER}:8080/login > /dev/null; do sleep 5; done" && echo "Jenkins is running" || echo "Jenkins is not running"
+# The colon (:) is a no-op command in Bash, which means it does nothing and always returns a true exit status. It is often used as a placeholder or to evaluate expressions without executing any commands.
+# The ${JENKINS_STARTUP_TIMEOUT:=60} part is a parameter expansion. It checks if the JENKINS_STARTUP_TIMEOUT variable is set and not null. If it is not set, it assigns the value 60 to JENKINS_STARTUP_TIMEOUT
+: "${JENKINS_STARTUP_TIMEOUT:=60}"  # Default to 60 seconds if not set
+timeout "${JENKINS_STARTUP_TIMEOUT}" bash -c "until curl -s -f http://${JENKINS_CONTROLLER}:8080/login > /dev/null; do sleep 5; done" && echo "Jenkins is running" || echo "Jenkins is not running"
+
 echo "Jenkins is ready"
 # Get the Jenkins version
-JENKINS_VERSION=$(curl -s -I -k http://admin:admin@jenkins_controller:8080 | grep -i '^X-Jenkins:' | awk '{print $2}')
+JENKINS_VERSION=$(curl -s -I -k http://admin:admin@$JENKINS_CONTROLLER:8080 | grep -i '^X-Jenkins:' | awk '{print $2}')
 echo "Jenkins version is: $JENKINS_VERSION"
 
 # Use the token in the curl command to reload the configuration
-# curl -X POST "http://admin:admin@jenkins_controller:8080/reload-configuration-as-code/?casc-reload-token=$JCASC_TOKEN"
-curl -X POST "http://admin:admin@jenkins_controller:8080/reload-configuration-as-code/?casc-reload-token=thisisnotsecure"
+# curl -X POST "http://admin:admin@$JENKINS_CONTROLLER:8080/reload-configuration-as-code/?casc-reload-token=$JCASC_TOKEN"
+curl -X POST "http://admin:admin@$JENKINS_CONTROLLER:8080/reload-configuration-as-code/?casc-reload-token=thisisnotsecure"

dockerfiles/android/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkins/ssh-agent:5.44.0 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

@@ -0,0 +1,19 @@
+FROM jenkins/ssh-agent:6.16.0-jdk21
+
+# Install necessary C++ build tools
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    cmake \
+    gcc \
+    g++ \
+    clang \
+    make \
+    libstdc++-12-dev \
+    pkg-config \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set environment variables
+ENV PATH="/usr/local/bin:$PATH"
+
+# Ensure the ownership of the Jenkins agent home directory is set to the Jenkins user
+RUN chown -R jenkins:jenkins "${JENKINS_AGENT_HOME}"

dockerfiles/dotnet/Dockerfile

@@ -0,0 +1,22 @@
+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 && \
+  rm -rf /var/lib/apt/lists/*
+
+# Now time to install dotnet
+ARG DOTNET_VERSION=8.0
+
+# Set SHELL flags for RUN commands to allow -e and pipefail
+# Rationale:https://github.com/hadolint/hadolint/wiki/DL4006
+SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
+
+RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && chmod +x ./dotnet-install.sh && \
+    ./dotnet-install.sh --channel ${DOTNET_VERSION} --install-dir /usr/local/dotnet
+
+ENV DOTNET_ROOT=/usr/local/dotnet
+ENV PATH=$PATH:$DOTNET_ROOT:$DOTNET_ROOT/tools
+
+RUN echo "PATH=${PATH}" >> /etc/environment && chown -R jenkins:jenkins "${JENKINS_AGENT_HOME}" && \
+    dotnet --list-sdks
+

dockerfiles/gitpodURL.sh

@@ -7,7 +7,7 @@ config_file="/workspace/quickstart-tutorials/dockerfiles/jenkins.yaml"
 service_url=$(echo "$GITPOD_WORKSPACE_URL" | awk -F/ '{print $3}')
 
 # Define an array of targets
-targets=("maven" "node" "python" "multi" "default")
+targets=("maven" "node" "python" "multi" "cpp" "dotnet" "default")
 
 # Initialize an empty string for the message
 message="As a gentle reminder, the current profiles are: "

dockerfiles/golang/Dockerfile

@@ -1,11 +1,11 @@
-FROM jenkins/ssh-agent:5.44.0 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 ca-certificates curl && apt-get clean && \
   rm -rf /var/lib/apt/lists/*
 
 # Now time to install golang
-ARG GOLANG_VERSION=1.22.5
+ARG GOLANG_VERSION=1.24.3
 ARG TARGETARCH
 ENV ARCHITECTURE=$TARGETARCH
 

dockerfiles/maven/Dockerfile

@@ -1,11 +1,11 @@
-FROM jenkins/ssh-agent:5.44.0 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 ca-certificates curl && apt-get clean && \
   rm -rf /var/lib/apt/lists/*
 
 # Now time to install maven
-ARG MAVEN_VERSION=3.9.8
+ARG MAVEN_VERSION=3.9.9
 
 # Set SHELL flags for RUN commands to allow -e and pipefail
 # Rationale:https://github.com/hadolint/hadolint/wiki/DL4006