Unverified Commit 8cfeaece authored by Matt Pryor's avatar Matt Pryor Committed by GitHub
Browse files

Merge branch 'devel' into issue/81/httpd-ciphers

parents c23819a6 8785c72e

cog/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ RUN apt-get update && \ 
    rm -rf /var/lib/apt/lists/*



# Clone the github repo and checkout the specified version

ARG ESGF_COG_GIT_VERSION=v3.11

ARG ESGF_COG_GIT_VERSION=v3.12.1

RUN git clone https://github.com/EarthSystemCoG/COG /application && \

    cd /application && \

    git checkout $ESGF_COG_GIT_VERSION && \

solr/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
## Standard Solr container with setup of ESGF cores built-in

#####



FROM solr:5.5

FROM solr:6.6



MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>