From 1c0be80536027468fc9d72a2db2306eb9a6489ad Mon Sep 17 00:00:00 2001 From: "kilnerm@uk.ibm.com" Date: Wed, 4 Sep 2019 11:55:51 +0100 Subject: [PATCH] Rebase to ubi 8 for maven and workaround kaniko issue --- incubator/java-microprofile/image/Dockerfile-stack | 5 ++--- incubator/java-microprofile/image/project/Dockerfile | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/incubator/java-microprofile/image/Dockerfile-stack b/incubator/java-microprofile/image/Dockerfile-stack index 9d723f877..4144c7112 100644 --- a/incubator/java-microprofile/image/Dockerfile-stack +++ b/incubator/java-microprofile/image/Dockerfile-stack @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi7/ubi +FROM registry.access.redhat.com/ubi8/ubi LABEL vendor="Kabanero" \ name="kabanero/java-microprofile" \ @@ -39,8 +39,7 @@ RUN set -eux; \ ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+UseContainerSupport -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle" # Maven install - RUN wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo \ - && yum install --disableplugin=subscription-manager -y maven + RUN yum install --disableplugin=subscription-manager -y maven ENV MAVEN_HOME /usr/share/maven ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2" diff --git a/incubator/java-microprofile/image/project/Dockerfile b/incubator/java-microprofile/image/project/Dockerfile index 6628403c0..6a8e08049 100644 --- a/incubator/java-microprofile/image/project/Dockerfile +++ b/incubator/java-microprofile/image/project/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi7/ubi +FROM registry.access.redhat.com/ubi8/ubi RUN yum upgrade --disableplugin=subscription-manager -y \ && yum clean --disableplugin=subscription-manager packages \ @@ -30,8 +30,7 @@ COPY . /project WORKDIR /project/user-app # Maven install -RUN wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo \ - && yum install --disableplugin=subscription-manager -y maven +RUN yum install --disableplugin=subscription-manager -y maven ENV MAVEN_HOME /usr/share/maven ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2" @@ -45,7 +44,7 @@ RUN cd target && \ FROM openliberty/open-liberty:microProfile3-ubi-min -COPY --chown=1001:0 --from=0 /config/ /config/ +COPY --chown=1001:0 --from=0 /config/ /opt/ol/wlp/usr/servers/defaultServer/ EXPOSE 9080 EXPOSE 9443