nomad

commit 7826a31f7701e17b1b2adc0c9eff49bac148f6ce
parent 863b95a12b080f5b87ae735be2414cabddde3de5
Author: Andreas Gruhler <agruhl@gmx.ch>
Date:   Wed,  6 Aug 2025 23:25:46 +0200

feat(jenkins-agent): install openjdk24 from pkgs not from source

Diffstat:
M
Jenkinsfile
 | 
4
++--
M
docker/docker-jenkins-inbound-agent/Dockerfile
 | 
14
++------------

2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,8 +5,8 @@ def buildahpush = new BuildahPush(this)
 
 node('podman'){
   checkout scm
-  buildahbud.execute('docker/docker-jenkins-inbound-agent', 'docker-jenkins-inbound-agent', 'arm64/v8', '3327.v868139a_d00e0')
-  buildahpush.execute('docker-jenkins-inbound-agent', '3327.v868139a_d00e0')
+  buildahbud.execute('docker/docker-jenkins-inbound-agent', 'jenkins-inbound-agent', 'arm64/v8', '3327.v868139a_d00e0')
+  buildahpush.execute('jenkins-inbound-agent', '3327.v868139a_d00e0')
 
   //gitleaks()
 }
diff --git a/docker/docker-jenkins-inbound-agent/Dockerfile b/docker/docker-jenkins-inbound-agent/Dockerfile
@@ -20,12 +20,6 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 ARG ALPINE_TAG=3.22.1
-FROM docker.io/alpine:"${ALPINE_TAG}" AS jre-build
-
-ARG JAVA_VERSION="24.0.2"
-ARG DOWNLOAD_URL="https://download.java.net/java/GA/jdk${JAVA_VERSION}/fdc5d0102fe0414db21410ad5834341f/12/GPL/openjdk-${JAVA_VERSION}_linux-aarch64_bin.tar.gz"
-RUN wget -q -O /tmp/jdk.tar.gz "${DOWNLOAD_URL}"
-RUN tar -xzf /tmp/jdk.tar.gz -C /opt/
 
 ## Agent image target
 FROM docker.io/alpine:"${ALPINE_TAG}" AS agent
@@ -44,7 +38,8 @@ ARG AGENT_WORKDIR=/home/"${user}"/agent
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 ENV TZ=Etc/UTC
 
-RUN apk add --no-cache \
+RUN apk update && apk add --no-cache \
+      openjdk24 \
       curl \
       bash \
       git \
@@ -63,11 +58,6 @@ ADD --chown="${user}":"${group}" "https://repo.jenkins-ci.org/public/org/jenkins
 RUN chmod 0644 /usr/share/jenkins/agent.jar \
   && ln -sf /usr/share/jenkins/agent.jar /usr/share/jenkins/slave.jar
 
-
-ENV JAVA_HOME="/opt/java/openjdk/${JAVA_VERSION}"
-COPY --from=jre-build "/opt/jdk-${JAVA_VERSION}" "$JAVA_HOME"
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-
 USER "${user}"
 ENV AGENT_WORKDIR="${AGENT_WORKDIR}"
 RUN mkdir -p /home/"${user}"/.jenkins && mkdir -p "${AGENT_WORKDIR}"