From 64a417085d8090e9157dfc9e2877726051c57946 Mon Sep 17 00:00:00 2001 From: ayushsatyam146 Date: Fri, 30 Aug 2024 11:20:58 +0530 Subject: [PATCH] updating builder image to use JDK21 based image Updating builder image to UBI9 JDK21 Image and removing the references to install maven externally --- Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7cc0c3bd..3c125cb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,14 @@ # This Dockerfile is intended for use by openshift/ci-operator config files defined # in openshift/release for v4.x prow based PR CI jobs -FROM quay.io/openshift/origin-jenkins-agent-maven:4.11.0 AS builder +FROM registry.access.redhat.com/ubi9/openjdk-21:1.20 AS builder WORKDIR /java/src/github.com/openshift/jenkins-client-plugin COPY . . USER 0 -# We need a newer maven version as the RHEL package is still on 3.6.2 -RUN curl -L -o maven.tar.gz https://dlcdn.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz && \ - mkdir maven && \ - tar -xvzf maven.tar.gz -C maven --strip-component 1 + # Use the downloaded version of maven to build the package -RUN ./maven/bin/mvn --version && \ - ./maven/bin/mvn clean package +RUN mvn --version +RUN mvn clean package FROM registry.ci.openshift.org/origin/4.16:jenkins RUN rm /opt/openshift/plugins/openshift-client.jpi