Commit 890e4988 authored by William Tucker's avatar William Tucker
Browse files

Merge branch 'upgrade-jdk-version' of https://github.com/ESGF/esgf-docker into... 

Merge branch 'upgrade-jdk-version' of https://github.com/ESGF/esgf-docker into issue/119/django-authentication-service
parents 7031095d 4fbaeb77

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.262.b10 && \

    yum install -y java-1.8.0-openjdk-devel-1.8.0.282.b08 && \

    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.262.b10 && \

    yum install -y java-1.8.0-openjdk-headless-1.8.0.282.b08 && \

    yum clean all



USER $ESGF_UID