From 27a9d2442235398c8ef26072815a663b492b555e Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1+github@gmail.com>
Date: Thu, 23 Sep 2021 18:27:23 +0100
Subject: [PATCH] Add java 17 preview

---
 11/bullseye/Dockerfile |  2 +-
 17/bullseye/Dockerfile | 83 ++++++++++++++++++++++++++++++++++++++++++
 8/bullseye/Dockerfile  |  2 +-
 docker-bake.hcl        | 18 +++++++++
 4 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 17/bullseye/Dockerfile

diff --git a/11/bullseye/Dockerfile b/11/bullseye/Dockerfile
index 28936d4ef..d7e951cc4 100644
--- a/11/bullseye/Dockerfile
+++ b/11/bullseye/Dockerfile
@@ -33,7 +33,7 @@ RUN jlink \
          --compress=2 \
          --output /javaruntime
 
-FROM debian:bullseye-20210816
+FROM debian:bullseye
 
 ARG VERSION=4.10
 ARG user=jenkins
diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile
new file mode 100644
index 000000000..b82879367
--- /dev/null
+++ b/17/bullseye/Dockerfile
@@ -0,0 +1,83 @@
+# The MIT License
+#
+#  Copyright (c) 2015-2020, CloudBees, Inc. and other Jenkins contributors
+#
+#  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:17_35-jdk-focal AS jre-build
+
+# Generate smaller java runtime without unneeded files
+# for now we include the full module path to maintain compatibility
+# while still saving space (approx 200mb from the full distribution)
+RUN jlink \
+         --add-modules ALL-MODULE-PATH \
+         --strip-debug \
+         --no-man-pages \
+         --no-header-files \
+         --compress=2 \
+         --output /javaruntime
+
+FROM debian:bullseye
+
+ARG VERSION=4.10
+ARG user=jenkins
+ARG group=jenkins
+ARG uid=1000
+ARG gid=1000
+
+RUN groupadd -g ${gid} ${group}
+RUN useradd -c "Jenkins user" -d /home/${user} -u ${uid} -g ${gid} -m ${user}
+LABEL Description="This is a base image, which provides the Jenkins agent executable (agent.jar)" Vendor="Jenkins project" Version="${VERSION}"
+
+ARG AGENT_WORKDIR=/home/${user}/agent
+
+RUN apt-get update \
+  && apt-get -y install \
+    git-lfs \
+    curl \
+    fontconfig \
+  && curl --create-dirs -fsSLo /usr/share/jenkins/agent.jar https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar \
+  && chmod 755 /usr/share/jenkins \
+  && chmod 644 /usr/share/jenkins/agent.jar \
+  && ln -sf /usr/share/jenkins/agent.jar /usr/share/jenkins/slave.jar \
+  && apt-get remove -y curl \
+  && rm -rf /var/lib/apt/lists/*
+
+ENV LANG C.UTF-8
+
+ENV JAVA_HOME=/opt/java/openjdk
+ENV PATH "${JAVA_HOME}/bin:${PATH}"
+COPY --from=jre-build /javaruntime $JAVA_HOME
+
+USER ${user}
+ENV AGENT_WORKDIR=${AGENT_WORKDIR}
+RUN mkdir /home/${user}/.jenkins && mkdir -p ${AGENT_WORKDIR}
+
+VOLUME /home/${user}/.jenkins
+VOLUME ${AGENT_WORKDIR}
+WORKDIR /home/${user}
+
+LABEL \
+    org.opencontainers.image.vendor="Jenkins project" \
+    org.opencontainers.image.title="Official Jenkins Agent Base Docker image" \
+    org.opencontainers.image.description="This is a base image, which provides the Jenkins agent executable (agent.jar)" \
+    org.opencontainers.image.version="${VERSION}" \
+    org.opencontainers.image.url="https://www.jenkins.io/" \
+    org.opencontainers.image.source="https://github.com/jenkinsci/docker-agent" \
+    org.opencontainers.image.licenses="MIT"
diff --git a/8/bullseye/Dockerfile b/8/bullseye/Dockerfile
index 40a3a4893..e9bcd1a03 100644
--- a/8/bullseye/Dockerfile
+++ b/8/bullseye/Dockerfile
@@ -22,7 +22,7 @@
 
 FROM eclipse-temurin:8u302-b08-jdk-focal AS jre-build
 
-FROM debian:bullseye-20210816
+FROM debian:bullseye
 
 ARG VERSION=4.10
 ARG user=jenkins
diff --git a/docker-bake.hcl b/docker-bake.hcl
index ce7f1d6fa..68a7388f9 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -5,12 +5,14 @@ group "linux" {
     "archlinux_jdk11",
     "debian_jdk8",
     "debian_jdk11",
+    "debian_jdk17",
   ]
 }
 
 group "linux-arm64" {
   targets = [
     "debian_jdk11",
+    "debian_jdk17",
   ]
 }
 
@@ -131,3 +133,19 @@ target "debian_jdk11" {
   ]
   platforms = ["linux/amd64", "linux/arm64", "linux/s390x"]
 }
+
+target "debian_jdk17" {
+  dockerfile = "17/bullseye/Dockerfile"
+  context = "."
+  args = {
+    VERSION = REMOTING_VERSION
+  }
+  tags = [
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk17-preview": "",
+    "${REGISTRY}/${JENKINS_REPO}:bullseye-jdk17-preview",
+    "${REGISTRY}/${JENKINS_REPO}:jdk17-preview",
+    "${REGISTRY}/${JENKINS_REPO}:latest-bullseye-jdk17-preview",
+    "${REGISTRY}/${JENKINS_REPO}:latest-jdk17-preview",
+  ]
+  platforms = ["linux/amd64", "linux/arm64"]
+}