Commit f888ce52 authored by William Tucker's avatar William Tucker
Browse files

Updated Java versions for SOLR and search

parent b976e4ec

images/search/Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ ARG ESGF_IMAGES_VERSION=latest 


# Make a reference to the builder

# We have to do this as a FROM because we can't use variables in COPY --from

# We've disabled the builder build so the latest available version is used

# Replace "latest" with "${ESGF_IMAGES_VERSION}" if building a new builder

FROM esgfdeploy/search-builder:latest as builder



# Build the runtime image
@@ -16,7 +18,7 @@ USER root 


RUN dnf makecache && \

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

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.382.b05-2.el9.x86_64 && \

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.402.b06-2.el9 && \

    dnf install -y zip && \

    dnf clean all

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 dnf makecache && \

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.382.b05-2.el9.x86_64 && \

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.402.b06-2.el9 && \

    dnf clean all



# Create Solr home directory