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

Working on data-node modularization.

parent 22921cff

docker-compose.yml

+17 −25
Original line number Diff line number Diff line
@@ -47,32 +47,24 @@ services: 
     volumes:

       - 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 Openid Relying Party

  esgf-orp:

    image: esgfhub/esgf-orp:${ESGF_VERSION}

    container_name: orp

    expose:

      - "8080"

      - "8443"

    ports:

      - "8083:8080"

      - "8446:8443"

    networks:

      - default

    volumes_from:

      - esgf-config

    environment:

     - ESGF_HOSTNAME



  # THREDDS Data Server

  esgf-tds:

    image: esgfhub/esgf-tds:${ESGF_VERSION}

    container_name: tds

esgf_config/httpd/conf/esgf-httpd.conf

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ WSGISocketPrefix run/wsgi 
  ProxyPassReverse        /solr   http://esgf-solr:8983/solr



  # proxy requests to Tomcat

  ProxyPass       /esg-orp        ajp://esgf-data-node:8009/esg-orp

  ProxyPassReverse /esg-orp       ajp://esgf-data-node:8009/esg-orp

  ProxyPass       /esg-orp        ajp://esgf-orp:8009/esg-orp

  ProxyPassReverse /esg-orp       ajp://esgf-orp:8009/esg-orp

  ProxyPass /esgf-idp     ajp://esgf-idp-node:8009/esgf-idp

  ProxyPassReverse /esgf-idp      ajp://esgf-idp-node:8009/esgf-idp

  ProxyPass /esg-search   ajp://esgf-index-node:8009/esg-search

orp/Dockerfile

0 → 100644
+27 −0
Original line number Diff line number Diff line 
# Docker image containing the ESGF Openid Relying Party (ORP)



ARG ESGF_IMAGES_HUB=esgfhub

ARG ESGF_VERSION=devel



FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION



MAINTAINER ESGF <esgf-devel@lists.llnl.gov>



# default ESGF repository

ARG ESGF_REPO=http://distrib-coffee.ipsl.jussieu.fr/pub/esgf



RUN mkdir -p /usr/local/tomcat/webapps/esg-orp



ADD $ESGF_REPO/dist/esg-orp/esg-orp.war /usr/local/tomcat/webapps/esg-orp/

RUN cd /usr/local/tomcat/webapps/esg-orp && \

    jar xvf esg-orp.war && \

    rm esg-orp.war && \

    chown -R tomcat:tomcat /usr/local/tomcat/webapps/esg-orp



# properties to read the Tomcat kesytore, used to sign the authentication cookie

# these values are the same for all ESGF nodes

COPY conf/esg-orp.properties /usr/local/tomcat/webapps/esg-orp/WEB-INF/classes/esg-orp.properties



# startup scripts

COPY scripts/ /usr/local/bin/

ENTRYPOINT /usr/local/bin/docker-entrypoint.sh

orp/conf/esg-orp.properties

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# location of keystore used to sign the authentication cookie

keystoreFile=/esg/config/tomcat/keystore-tomcat



# password used to read the keystore

keystorePassword=changeit



# alias of keystore entry used to sign the authentication cookie

keystoreAlias=my_esgf_node



# location of file that lists knownn

orp.provider.list=/esg/config/esgf_known_providers.xml

orp/scripts/docker-entrypoint.sh

0 → 100755
+8 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Script to start the TDS with ESGF configuration



# deploy esgf config files

/usr/local/bin/process_esgf_config_archive.sh



# startup configuration inherited from esgf-tomcat image

supervisord --nodaemon -c /etc/supervisord.conf