Commit 6d1475f9 authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Merge branch 'devel' into issue/56/testing-guide

parents 8c87acca a0901c7e

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ 
**/*.jar

**/*.gz

_site/

.project

cog/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,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.9.7

ARG ESGF_COG_GIT_VERSION=v3.11

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

    cd /application && \

    git checkout $ESGF_COG_GIT_VERSION && \

publisher/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ RUN conda install -y -c conda-forge -c uvcdat \ 
      'SQLAlchemy==0.7.10' \

      sqlalchemy_migrate \

      ESGConfigParser==0.1.10 \

      esgprep

      esgprep==2.7.40



# Install the publisher client from GitHub

ARG ESG_PUBLISHER_VERSION=v3.2.7