Skip to content

Commit

Permalink
have java in rpm history
Browse files Browse the repository at this point in the history
  • Loading branch information
mchyzer committed Nov 10, 2020
1 parent 5e92e18 commit 9fdf757
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
ImageOS=centos7

ARG GROUPER_CONTAINER_VERSION
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto

ENV PATH=$PATH:$JAVA_HOME/bin \
GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF \
GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
Expand All @@ -69,7 +69,18 @@ RUN yum update -y \
&& pip install --upgrade pip \
&& pip install supervisor \
&& yum clean -y all
COPY --from=installing $JAVA_HOME $JAVA_HOME
#COPY --from=installing $JAVA_HOME $JAVA_HOME
# do this again so its in rpm history
ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-linux-jdk.rpm
ARG CORRETTO_RPM=amazon-corretto-8-x64-linux-jdk.rpm
COPY container_files/java-corretto/corretto-signing-key.pub .
RUN curl -O -L $CORRETTO_URL_PERM \
&& rpm --import corretto-signing-key.pub \
&& rpm -K $CORRETTO_RPM \
&& rpm -i $CORRETTO_RPM \
&& rm -r corretto-signing-key.pub $CORRETTO_RPM
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto

COPY --from=cleanup /opt/tomee/ /opt/tomee/
COPY --from=cleanup /opt/grouper/ /opt/grouper/
RUN groupadd -r tomcat \
Expand Down

0 comments on commit 9fdf757

Please sign in to comment.