plt-1858: update Jenkins images to support Java 17, add SDKMAN, and update agent configuration

Author: szhu95

.github/workflows/ci.yml

@@ -13,14 +13,15 @@ jobs:
       matrix:
         remoting_tag:
           - 4.13.2-1-jdk11
+          - 4.13.3-1-jdk17
     runs-on: ubuntu-latest
     steps:
       - name: Build and Push Docker Image
         uses: Dwolla/jenkins-agents-workflow/.github/actions/build@main
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-          BASE_TAG: ${{ matrix.REMOTING_TAG }}
+          BASE_TAG: ${{ matrix.remoting_tag }}
           TAG_NAME: JENKINS_REMOTING_TAG
           IMAGE_NAME: dwolla/jenkins-agent-core
   build-complete:

Dockerfile

@@ -6,14 +6,16 @@ LABEL org.label-schema.vcs-url="https://github.com/Dwolla/jenkins-agent-docker-c
 ENV JENKINS_HOME=/home/jenkins
 
 COPY build/install-esh.sh /tmp/build/install-esh.sh
+COPY build/jenkins-agent-entrypoint.sh /usr/local/bin/jenkins-agent-entrypoint.sh
+COPY build/sdkman-init-wrapper.sh /usr/local/bin/sdkman-init-wrapper.sh
 
 WORKDIR ${JENKINS_HOME}
 
 USER root
 
 RUN set -ex && \
     apt-get update && \
-    apt-get install -y \
+    (apt-get install -y \
         asciidoctor \
         apt-transport-https \
         bash \
@@ -30,13 +32,31 @@ RUN set -ex && \
         python3-venv \
         shellcheck \
         zip \
-        && \
+    || (sleep 5 && apt-get update && apt-get install -y \
+        asciidoctor \
+        apt-transport-https \
+        bash \
+        bc \
+        ca-certificates \
+        curl \
+        expect \
+        git \
+        gpg \
+        jq \
+        make \
+        python3 \
+        python3-pip \
+        python3-venv \
+        shellcheck \
+        zip)) && \
     pip3 install --upgrade \
         awscli \
         virtualenv \
         && \
     ln -s /usr/bin/python3 /usr/bin/python && \
     /tmp/build/install-esh.sh v0.3.2 && \
+    chmod +x /usr/local/bin/jenkins-agent-entrypoint.sh && \
+    chmod +x /usr/local/bin/sdkman-init-wrapper.sh && \
     rm -rf /tmp/build && \
     mkdir -p /usr/share/man/man1/ && \
     touch /usr/share/man/man1/sh.distrib.1.gz
@@ -53,4 +73,8 @@ RUN git config --global user.email "dev+jenkins@dwolla.com" && \
     git config --global 'credential.https://github.com.username' 'x-access-token' && \
     git config --global 'credential.https://github.com.helper' '!f() { if [ "$1" = get ]; then case "${GH_TOKEN-}" in (*[![:space:]]*) echo "password=${GH_TOKEN}";; (*) echo "error: GH_TOKEN is missing" >&2; exit 1;; esac; fi; }; f'
 
-ENTRYPOINT ["jenkins-agent"]
+# Install SDKMAN
+RUN curl -s "https://get.sdkman.io" | bash && \
+    bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk version"
+
+ENTRYPOINT ["/usr/local/bin/jenkins-agent-entrypoint.sh"]

Makefile

@@ -2,14 +2,29 @@ JENKINS_REMOTING_TAG := 4.13.2-1-jdk11
 JOB := remoting-${JENKINS_REMOTING_TAG}
 CLEAN_JOB := clean-${CORE_TAG}
 
+# Default target builds Java 11 variant
+all: remoting-4.13.2-1-jdk11 remoting-4.13.3-1-jdk17
+
 clean: ${CLEAN_JOB}
-.PHONY: all clean ${JOB} ${CLEAN_JOB}
+.PHONY: all clean ${JOB} ${CLEAN_JOB} remoting-4.13.2-1-jdk11 remoting-4.13.3-1-jdk17
 
 ${JOB}: remoting-%: Dockerfile
 	docker build \
 	  --build-arg JENKINS_REMOTING_TAG=$* \
 	  --tag dwolla/jenkins-agent-core:$*-SNAPSHOT \
 	  .
 
+remoting-4.13.2-1-jdk11: Dockerfile
+	docker build \
+	  --build-arg JENKINS_REMOTING_TAG=4.13.2-1-jdk11 \
+	  --tag dwolla/jenkins-agent-core:4.13.2-1-jdk11-SNAPSHOT \
+	  .
+
+remoting-4.13.3-1-jdk17: Dockerfile
+	docker build \
+	  --build-arg JENKINS_REMOTING_TAG=4.13.3-1-jdk17 \
+	  --tag dwolla/jenkins-agent-core:4.13.3-1-jdk17-SNAPSHOT \
+	  .
+
 ${CLEAN_JOB}: clean-%:
 	docker rmi -f dwolla/jenkins-agent-core:$*-SNAPSHOT

build/jenkins-agent-entrypoint.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+set -o errexit -o nounset -o pipefail
+
+# Custom entrypoint that supports privileged token with fallback to regular token
+# Priority: JENKINS_PRIVILEGED_SECRET > JENKINS_SECRET
+
+# Determine which secret to use
+if [ -n "${JENKINS_PRIVILEGED_SECRET:-}" ]; then
+    # Use privileged token if provided
+    export JENKINS_SECRET="${JENKINS_PRIVILEGED_SECRET}"
+    echo "Using privileged token for Jenkins agent connection"
+elif [ -n "${JENKINS_SECRET:-}" ]; then
+    # Fall back to regular token if privileged token not provided
+    echo "Using regular token for Jenkins agent connection"
+else
+    echo "Error: Neither JENKINS_PRIVILEGED_SECRET nor JENKINS_SECRET is set" >&2
+    exit 1
+fi
+
+# Find the original jenkins-agent script (it should be in PATH from the base image)
+JENKINS_AGENT_SCRIPT=$(command -v jenkins-agent)
+if [ -z "${JENKINS_AGENT_SCRIPT}" ]; then
+    echo "Error: jenkins-agent script not found in PATH" >&2
+    exit 1
+fi
+
+# Call the original jenkins-agent entrypoint with all arguments
+exec "${JENKINS_AGENT_SCRIPT}" "$@"
+

build/sdkman-init-wrapper.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+# SDKMAN initialization wrapper script
+# This script is designed to be used as BASH_ENV to automatically configure
+# SDKMAN when .sdkmanrc files are present in the workspace.
+#
+# When BASH_ENV is set to this script, it will be sourced by every non-interactive
+# bash shell, ensuring SDKMAN is configured before any commands run.
+
+# Source SDKMAN initialization if it exists
+if [ -f "$HOME/.sdkman/bin/sdkman-init.sh" ]; then
+  # SDKMAN requires errexit to be disabled during initialization
+  set +o errexit +o xtrace
+  
+  # Source SDKMAN initialization
+  source "$HOME/.sdkman/bin/sdkman-init.sh"
+  
+  # Check if .sdkmanrc exists in the current working directory or workspace
+  # Jenkins workspace is typically in $WORKSPACE or current directory
+  SDKMANRC_PATH=""
+  if [ -f ".sdkmanrc" ]; then
+    SDKMANRC_PATH=".sdkmanrc"
+  elif [ -n "${WORKSPACE:-}" ] && [ -f "${WORKSPACE}/.sdkmanrc" ]; then
+    SDKMANRC_PATH="${WORKSPACE}/.sdkmanrc"
+  fi
+  
+  if [ -n "$SDKMANRC_PATH" ]; then
+    # Change to the directory containing .sdkmanrc for sdk env install
+    SDKMANRC_DIR=$(dirname "$SDKMANRC_PATH")
+    if [ "$SDKMANRC_DIR" != "." ]; then
+      cd "$SDKMANRC_DIR" || true
+    fi
+    # Install Java version specified in .sdkmanrc
+    sdk env install || true
+    # Re-source to ensure the new Java is on PATH
+    source "$HOME/.sdkman/bin/sdkman-init.sh"
+  fi
+  
+  # Re-enable errexit and xtrace
+  set -o errexit -o xtrace
+fi
+