Merge branch 'main' of https://github.com/gounthar/quickstart-tutorials

Author: gounthar

.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,4 @@ updates:
     directory: "./dockerfiles/golang"
     schedule:
       interval: weekly
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 10

.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@f2ba85e044c8f5e5014c9a539328a9c78d3bfa49
+        uses: anchore/scan-action@abae793926ec39a78ab18002bc7fc45bbbd94342
         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.70.0
+        uses: updatecli/updatecli-action@v2.75.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:2024-11-20-08-19-55
+FROM gitpod/workspace-full:2025-01-08-07-57-03
 
 # 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

@@ -62,7 +62,7 @@ services:
       timeout: 10s
       retries: 5
   default_agent:
-    image: jenkins/ssh-agent:6.2.0
+    image: jenkins/ssh-agent:6.6.0
     container_name: desktop-jenkins_agent-1
     profiles:
       - default

docker-compose.yaml

@@ -59,7 +59,6 @@ services:
       - python
       - node
       - android
-      - multi
       - golang
       - default
     # The CASC_RELOAD_TOKEN environment variable is used by the Jenkins controller to restart the Configuration as Code (JCasc) plugin configuration.
@@ -109,7 +108,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.2.0
+    image: jenkins/ssh-agent:6.6.0
     container_name: desktop-jenkins_agent-1
     profiles:
       - default

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

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-20241223-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:6.2.0 as ssh-agent
+FROM jenkins/ssh-agent:6.6.0 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