Skip to content
This repository has been archived by the owner on Jul 28, 2023. It is now read-only.

Commit

Permalink
Merge pull request #57 from kabanero-io/micro_build
Browse files Browse the repository at this point in the history
Rebase to ubi 8 for maven and workaround kaniko issue
  • Loading branch information
groeges authored Sep 4, 2019
2 parents 830fc54 + 1c0be80 commit 82e962c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 2 additions & 3 deletions incubator/java-microprofile/image/Dockerfile-stack
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down Expand Up @@ -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"
Expand Down
7 changes: 3 additions & 4 deletions incubator/java-microprofile/image/project/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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"
Expand All @@ -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

0 comments on commit 82e962c

Please sign in to comment.