From defb8781aa2e4f09909e57e27fd72cbb712be990 Mon Sep 17 00:00:00 2001 From: bob-rohan Date: Thu, 9 Dec 2021 15:00:04 +0000 Subject: [PATCH] Add Java 17 Alpine (#222) --- 17/alpine/Dockerfile | 82 ++++++++++++++++++++++++++++++++++++++++++++ docker-bake.hcl | 15 ++++++++ 2 files changed, 97 insertions(+) create mode 100644 17/alpine/Dockerfile diff --git a/17/alpine/Dockerfile b/17/alpine/Dockerfile new file mode 100644 index 000000000..7403eeeff --- /dev/null +++ b/17/alpine/Dockerfile @@ -0,0 +1,82 @@ +# 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 alpine:3.15.0 as jre-build + +RUN apk add --update --no-cache openjdk17-jdk openjdk17-jmods + +# 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 \ + --module-path /usr/lib/jvm/default-jvm/jmods \ + --add-modules ALL-MODULE-PATH \ + --strip-java-debug-attributes \ + --no-man-pages \ + --no-header-files \ + --compress=2 \ + --output /javaruntime + +FROM alpine:3.15.0 + +ARG VERSION=4.11.2 +ARG user=jenkins +ARG group=jenkins +ARG uid=1000 +ARG gid=1000 + +RUN addgroup -g ${gid} ${group} +RUN adduser -h /home/${user} -u ${uid} -G ${group} -D ${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 + +ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' + +RUN apk add --update --no-cache curl bash git git-lfs musl-locales openssh-client openssl procps \ + && 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 \ + && apk del --purge curl \ + && rm -rf /tmp/*.apk /tmp/gcc /tmp/gcc-libs.tar* /tmp/libz /tmp/libz.tar.xz /var/cache/apk/* + +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/docker-bake.hcl b/docker-bake.hcl index 68a7388f9..8d3db2a7c 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -2,6 +2,7 @@ group "linux" { targets = [ "alpine_jdk8", "alpine_jdk11", + "alpine_jdk17", "archlinux_jdk11", "debian_jdk8", "debian_jdk11", @@ -100,6 +101,20 @@ target "alpine_jdk11" { platforms = ["linux/amd64"] } +target "alpine_jdk17" { + dockerfile = "17/alpine/Dockerfile" + context = "." + args = { + VERSION = REMOTING_VERSION + } + tags = [ + equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-alpine-jdk17": "", + "${REGISTRY}/${JENKINS_REPO}:alpine-jdk17-preview", + "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk17-preview", + ] + platforms = ["linux/amd64"] +} + target "debian_jdk8" { dockerfile = "8/bullseye/Dockerfile" context = "."