Revert back to using UBI 7 image for java-microprofile

Signed-off-by: Steve Groeger <[email protected]>
kabanero-io · Sep 4, 2019 · 343c5dc · 343c5dc
1 parent 82e962c
commit 343c5dc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/incubator/java-microprofile/image/Dockerfile-stack b/incubator/java-microprofile/image/Dockerfile-stack
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/ubi
+FROM registry.access.redhat.com/ubi7/ubi
 
 LABEL vendor="Kabanero" \
     name="kabanero/java-microprofile" \
@@ -39,7 +39,8 @@ RUN set -eux; \
    ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+UseContainerSupport -XX:+IdleTuningCompactOnIdle -XX:+IdleTuningGcOnIdle"
 
  # Maven install
- RUN yum install --disableplugin=subscription-manager -y maven
+ 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 apache-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
@@ -1,8 +1,7 @@
-FROM registry.access.redhat.com/ubi8/ubi
+FROM registry.access.redhat.com/ubi7/ubi
 
 RUN yum upgrade --disableplugin=subscription-manager -y \
    && yum clean --disableplugin=subscription-manager packages \
-   && mkdir -p /mvn/repository \
    && echo 'Finished installing dependencies'
 
 USER root
@@ -30,7 +29,10 @@ COPY . /project
 WORKDIR /project/user-app
 
 # Maven install
-RUN yum install --disableplugin=subscription-manager -y maven
+RUN mkdir -p /mvn/repository
+
+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 apache-maven
 
 ENV MAVEN_HOME /usr/share/maven
 ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"