Unverified Commit 0eaedb72 authored by watucker's avatar watucker Committed by GitHub
Browse files

Merge pull request #177 from ESGF/java11 

Java11
parents 599b7af2 839a494f

images/jdk/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 
USER root



RUN yum makecache && \

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

    yum install -y java-11-openjdk-devel-11.0.15.0.9 && \

    yum clean all

images/jre/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 
USER root



RUN yum makecache && \

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

    yum install -y java-11-openjdk-headless-11.0.15.0.9 && \

    yum clean all



USER $ESGF_UID

images/solr/Dockerfile

+6 −1
Original line number Diff line number Diff line
@@ -4,10 +4,15 @@ 


ARG ESGF_REPOSITORY_BASE=esgfdeploy

ARG ESGF_IMAGES_VERSION=latest

FROM ${ESGF_REPOSITORY_BASE}/jre:${ESGF_IMAGES_VERSION}

FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION}



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 clean all



# Create Solr home directory

ENV SOLR_HOME="/var/solr/data" \

    SOLR_LOGS_DIR="/var/solr/logs" \