Commit 3655b842 authored by William Tucker's avatar William Tucker
Browse files

Merge branch 'master' of https://github.com/ESGF/esgf-docker into bugfix/nginx-temp-files

parents 6840244f 1694c58c

deploy/ansible/roles/proxy/defaults/main.yml

+3 −0
Original line number Diff line number Diff line
@@ -51,3 +51,6 @@ solr_enabled: true 


# Indicates if search is enabled

search_enabled: true



# Indicates if the auth service should be deployed or not

auth_enabled: false

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

    dnf install -y java-11-openjdk-devel-11.0.22.0.7-2.el9 && \

    dnf install -y java-11-openjdk-devel-11.0.23.0.9-3.el9 && \

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

    dnf install -y java-11-openjdk-headless-11.0.22.0.7-2.el9 && \

    dnf install -y java-11-openjdk-headless-11.0.23.0.9-3.el9 && \

    dnf clean all



USER $ESGF_UID

images/search/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -18,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.402.b06-2.el9 && \

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.412.b08-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.402.b06-2.el9 && \

    dnf install -y java-1.8.0-openjdk-headless-1.8.0.412.b08-2.el9 && \

    dnf clean all



# Create Solr home directory