Unverified Commit 83cb3784 authored by watucker's avatar watucker Committed by GitHub
Browse files

Merge pull request #186 from ESGF/java-8-search 

Java 8 search
parents a135989d 609743eb

images/search/Dockerfile

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ FROM ${ESGF_REPOSITORY_BASE}/tomcat:${ESGF_IMAGES_VERSION} 


USER root



RUN yum makecache && \

    yum remove -y java-11-openjdk-headless && \

    yum install -y java-1.8.0-openjdk-headless-1.8.0.345.b01 && \

    yum clean all



# Copy the unpacked webapp from the builder

COPY --from=builder /application ./webapps/esg-search

# Install a custom log4j.xml that doesn't roll log files

images/solr/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ USER root 


# Specific version of Java required by SOLR

RUN yum makecache && \

    yum install -y java-1.8.0-openjdk-headless-1.8.0.332.b09 && \

    yum install -y java-1.8.0-openjdk-headless-1.8.0.345.b01 && \

    yum clean all



# Create Solr home directory