Commit 746f172a authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Updating data node configuration.

parent 83e8abac

data-node/Dockerfile

+4 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ RUN source ${CDAT_HOME}/bin/activate esgf-pub && \ 
    pip install esgprep



# install ESGF publisher

# location: /usr/local/conda/lib/python2.7/site-packages/esgcet-3.0.1-py2.7.egg

ENV ESG_PUBLISHER_VERSION=v3.0.1

# location: /usr/local/conda/envs/esgf-pub/

ENV ESG_PUBLISHER_VERSION=v3.2.2

RUN source ${CDAT_HOME}/bin/activate esgf-pub && \

    cd /tmp && \

    git clone https://github.com/ESGF/esg-publisher.git && \
@@ -148,6 +148,8 @@ COPY scripts/ /usr/local/bin/ 


# change ownership of content directory

RUN chown -R tomcat:tomcat  /esg/content/thredds/

# change ownership of source directory

RUN chown -R tomcat:tomcat $CATALINA_HOME/webapps/thredds



# cleanup

RUN rm -rf /usr/local/tomcat/webapps/esgf-node-manager/

docker-compose.yml

+24 −24
Original line number Diff line number Diff line
@@ -46,30 +46,30 @@ services: 
       - pg_data:/var/lib/pgsql/data



  # ESGF Data Node

  #esgf-data-node:

  #  image: esgfhub/esgf-data-node:${ESGF_VERSION}

  #  container_name: data-node

  #  expose:

  #    - "8080"

  #    - "8443"

  #  ports:

  #    - "8080:8080"

  #    - "8443:8443"

  #  networks:

  #    - default

  #    - dbnetwork 

  #  volumes:

  #    - tds_data:/esg/content/thredds

  #    - $ESGF_CONFIG/webapps/thredds/WEB-INF/web.xml:/usr/local/tomcat/webapps/thredds/WEB-INF/web.xml

  #    - $ESGF_DATA_DIR:/esg/data

  #    - $ESGF_CONFIG/grid-security/certificates/:/etc/grid-security/certificates/

  #    - $ESGF_CONFIG/globus/certificate-file:/root/.globus/certificate-file

  #  volumes_from:

  #    - esgf-config

  #  environment:

  #   - ESGF_HOSTNAME

  #  depends_on:

  #    - esgf-postgres

  esgf-data-node:

    image: esgfhub/esgf-data-node:${ESGF_VERSION}

    container_name: data-node

    expose:

      - "8080"

      - "8443"

    ports:

      - "8080:8080"

      - "8443:8443"

    networks:

      - default

      - dbnetwork 

    volumes:

      - tds_data:/esg/content/thredds

      - $ESGF_CONFIG/webapps/thredds/WEB-INF/web.xml:/usr/local/tomcat/webapps/thredds/WEB-INF/web.xml

      - $ESGF_DATA_DIR:/esg/data

      - $ESGF_CONFIG/grid-security/certificates/:/etc/grid-security/certificates/

      - $ESGF_CONFIG/globus/certificate-file:/root/.globus/certificate-file

    volumes_from:

      - esgf-config

    environment:

     - ESGF_HOSTNAME

    depends_on:

      - esgf-postgres





  # ESGF Identity Provider