chore: factorize JDK specification to docker bakefile / powershell scripts

.github/dependabot.yml

@@ -1,32 +1,22 @@
 version: 2
 updates:
 - package-ecosystem: docker
-  directory: "/11/alpine"
+  directory: "/alpine"
   schedule:
     interval: weekly
   open-pull-requests-limit: 10
 - package-ecosystem: docker
-  directory: "/11/bullseye"
+  directory: "/debian"
   schedule:
     interval: weekly
   open-pull-requests-limit: 10
 - package-ecosystem: docker
-  directory: "/11/windows/nanoserver-ltsc2019"
+  directory: "/windows/nanoserver-ltsc2019"
   schedule:
     interval: weekly
   open-pull-requests-limit: 10
 - package-ecosystem: docker
-  directory: "/11/windows/windowsservercore-ltsc2019"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10
-- package-ecosystem: docker
-  directory: "/17/alpine"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10
-- package-ecosystem: docker
-  directory: "/17/bullseye"
+  directory: "/windows/windowsservercore-ltsc2019"
   schedule:
     interval: weekly
   open-pull-requests-limit: 10

.gitignore

@@ -1,10 +1,5 @@
 .DS_Store
 bats-core/
 bats/
-11/*/setup-sshd*
-*/CreateProfile.psm1
 target/
-
-/*/**/CreateProfile.psm1
 /.vscode/
-/*/**/setup-sshd

README.md

@@ -67,7 +67,7 @@ You should be all set.
 Should you need to extend the image, you could use something along those lines:
 
 ```Dockerfile
-FROM jenkins/ssh-agent:bullseye-jdk17 as ssh-agent
+FROM jenkins/ssh-agent:debian-jdk17 as ssh-agent
 # [...]
 COPY --chown=jenkins mykey "${JENKINS_AGENT_HOME}"/.ssh/mykey
 # [...]
@@ -79,10 +79,10 @@ The image has several supported configurations, which can be accessed via the fo
 
 `${IMAGE_VERSION}` can be found on the [releases](https://github.com/jenkinsci/docker-ssh-agent/releases) page.
 
-* `latest`, `latest-jdk11`, `jdk11`, `latest-bullseye-jdk11`, `bullseye-jdk11`, `${IMAGE_VERSION}`, `${IMAGE_VERSION}-jdk11`, ([Dockerfile](11/bullseye/Dockerfile))
-* `latest-jdk17`, `jdk17`, `latest-bullseye-jdk17`, `bullseye-jdk17`, `${IMAGE_VERSION}-jdk17`, ([Dockerfile](17/bullseye/Dockerfile))
-* `nanoserver-1809`, `nanoserver-ltsc2019`, `nanoserver-1809-jdk11`, `nanoserver-ltsc2019-jdk11`, `${IMAGE_VERSION}-nanoserver-1809`, `${IMAGE_VERSION}-nanoserver-ltsc2019`, `${IMAGE_VERSION}-nanoserver-1809-jdk11`, `${IMAGE_VERSION}-nanoserver-ltsc2019-jdk11` ([Dockerfile](11/windows/nanoserver-ltsc2019/Dockerfile))
-* `windowsservercore-1809`, `windowsservercore-ltsc2019`, `windowsservercore-1809-jdk11`, `windowsservercore-ltsc2019-jdk11`, `${IMAGE_VERSION}-windowsservercore-1809`, `${IMAGE_VERSION}-windowsservercore-ltsc2019`, `${IMAGE_VERSION}-windowsservercore-1809-jdk11`, `${IMAGE_VERSION}-windowsservercore-ltsc2019-jdk11` ([Dockerfile](11/windows/windowsservercore-ltsc2019/Dockerfile))
+* `latest`, `latest-jdk11`, `jdk11`, `latest-bullseye-jdk11`, `bullseye-jdk11`, `latest-debian-jdk11`, `debian-jdk11`, `${IMAGE_VERSION}`, `${IMAGE_VERSION}-jdk11`, ([Dockerfile](debian/Dockerfile))
+* `latest-jdk17`, `jdk17`, `latest-bullseye-jdk17`, `bullseye-jdk17`,`latest-debian-jdk17`, `debian-jdk17`, `${IMAGE_VERSION}-jdk17`, ([Dockerfile](debian/Dockerfile))
+* `nanoserver-1809`, `nanoserver-ltsc2019`, `nanoserver-1809-jdk11`, `nanoserver-ltsc2019-jdk11`, `${IMAGE_VERSION}-nanoserver-1809`, `${IMAGE_VERSION}-nanoserver-ltsc2019`, `${IMAGE_VERSION}-nanoserver-1809-jdk11`, `${IMAGE_VERSION}-nanoserver-ltsc2019-jdk11` ([Dockerfile](windows/nanoserver-ltsc2019/Dockerfile))
+* `windowsservercore-1809`, `windowsservercore-ltsc2019`, `windowsservercore-1809-jdk11`, `windowsservercore-ltsc2019-jdk11`, `${IMAGE_VERSION}-windowsservercore-1809`, `${IMAGE_VERSION}-windowsservercore-ltsc2019`, `${IMAGE_VERSION}-windowsservercore-1809-jdk11`, `${IMAGE_VERSION}-windowsservercore-ltsc2019-jdk11` ([Dockerfile](windows/windowsservercore-ltsc2019/Dockerfile))
 
 ## Building instructions
 
@@ -174,7 +174,7 @@ make show
   "target": {
     "alpine_jdk11": {
       "context": ".",
-      "dockerfile": "11/alpine/Dockerfile",
+      "dockerfile": "alpine/Dockerfile",
       "tags": [
         "docker.io/jenkins/ssh-agent:alpine-jdk11",
         "docker.io/jenkins/ssh-agent:latest-alpine-jdk11"

11/alpine/Dockerfile → alpine/Dockerfile

@@ -20,7 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-FROM eclipse-temurin:11.0.19_7-jdk-alpine
+ARG JAVA_VERSION="17.0.7_7"
+FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-alpine
 
 ARG user=jenkins
 ARG group=jenkins

11/bullseye/Dockerfile → debian/Dockerfile

@@ -1,35 +1,36 @@
-# The MIT License
-#
-#  Copyright (c) 2015, CloudBees, Inc.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-
-FROM eclipse-temurin:11.0.19_7-jdk-focal as jre-build
+ARG JAVA_VERSION=17.0.7_7
+FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-focal AS jre-build
+
+# This Build ARG is populated by Docker
+# Ref. https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
+ARG TARGETPLATFORM
+
+SHELL ["/bin/bash","-e", "-u", "-o", "pipefail", "-c"]
 
 # Generate smaller java runtime without unneeded files
 # for now we include the full module path to maintain compatibility
-# while still saving space
-RUN jlink \
-         --add-modules ALL-MODULE-PATH \
-         --no-man-pages \
-         --compress=2 \
-         --output /javaruntime
+# while still saving space (approx 200mb from the full distribution)
+RUN if test "${TARGETPLATFORM}" != 'linux/arm/v7'; then \
+    case "$(jlink --version 2>/dev/null)" in \
+        # jlink version 11 has less features than JDK17+
+        "11."*) strip_java_debug_flags=("--strip-debug") ;; \
+        *) strip_java_debug_flags=("--strip-java-debug-attributes") ;; \
+    esac; \
+    if test "${TARGETPLATFORM}" != 'linux/amd/64'; then \
+        # posix_spawn (default for JDK12+) fails erratically with qemu on non x86 CPUs - https://github.com/openzipkin/docker-java/issues/34#issuecomment-721673618
+        export JAVA_TOOL_OPTIONS='-Djdk.lang.Process.launchMechanism=vfork'; \
+    fi; \
+    jlink \
+        --add-modules ALL-MODULE-PATH \
+        "${strip_java_debug_flags[@]}" \
+        --no-man-pages \
+        --no-header-files \
+        --compress=2 \
+        --output /javaruntime; \
+    # It is acceptable to have a larger image in arm/v7 (arm 32 bits) environment.
+    # Because jlink fails with the error "jmods: Value too large for defined data type" error.
+    else cp -r /opt/java/openjdk /javaruntime; \
+    fi
 
 FROM debian:bullseye-20230502
 
@@ -40,7 +41,7 @@ ARG gid=1000
 ARG JENKINS_AGENT_HOME=/home/${user}
 
 ENV JENKINS_AGENT_HOME=${JENKINS_AGENT_HOME}
-ARG AGENT_WORKDIR="${JENKINS_AGENT_HOME}"/agent
+ARG AGENT_WORKDIR="${JENKINS_AGENT_HOME}/agent"
 # Persist agent workdir path through an environment variable for people extending the image
 ENV AGENT_WORKDIR=${AGENT_WORKDIR}
 
@@ -53,11 +54,11 @@ RUN groupadd -g ${gid} ${group} \
 
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
-       git-lfs \
-       less \
-       netcat-traditional \
-       openssh-server \
-       patch \
+        git-lfs \
+        less \
+        netcat-traditional \
+        openssh-server \
+        patch \
     && rm -rf /var/lib/apt/lists/*
 
 # setup SSH server