Commit 657e80db authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Switching docker compose to use version 1.0 of ESGF services.

parent d0eb5e72

.env

+3 −1
Original line number Diff line number Diff line 
# default environmet values used by ESGF/Docker

# default environment values used by ESGF/Docker

ESGF_HOSTNAME=my-node.esgf.org

ESGF_CONFIG=~/esgf_config

ESGF_DATA_DIR=/tmp

ESGF_VERSION=1.0

docker-compose-data-node.yml

+7 −5
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#       example: export ESGF_HOSTNAME=my.esgf.node

#       example: export ESGF_HOSTNAME=`docker-machine ip`

# ESGF_DATA_DIR: root of ESGF data directories

# ESGF_VERSION: version of ESGF/Docker distribution

#       example: export ESGF_VERSION=1.0



version: '2'
@@ -16,7 +18,7 @@ networks: 
services:



  esgf-data-node:

    image: esgfhub/esgf-data-node

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

    container_name: data-node

    expose:

      - "8080"
@@ -38,7 +40,7 @@ services: 


  # data container holding site-specific ESGF configuration

  esgf-config:

    image: centos:centos6.7

    image: centos:6

    container_name: esgf-config

    volumes:

     - $ESGF_CONFIG/httpd/certs/:/etc/certs/
@@ -49,7 +51,7 @@ services: 
     - $ESGF_CONFIG/esg/config/tomcat/esg-truststore.ts:/usr/java/latest/jre/lib/security/jssecacerts



  esgf-postgres:

     image: esgfhub/esgf-postgres

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

     expose:

       - "5432"

     ports:
@@ -59,7 +61,7 @@ services: 
       - dbnetwork



  esgf-httpd:

   image: esgfhub/esgf-httpd

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

   container_name: httpd

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

   volumes_from:
@@ -76,7 +78,7 @@ services: 


  # FTP server

  esgf-ftp:

   image: esgfhub/esgf-vsftp

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

   container_name: ftp

   ports:

     - "21:21"

docker-compose-index-node.yml

+6 −5
Original line number Diff line number Diff line
@@ -5,15 +5,16 @@ 
# ESGF_HOSTNAME: HostName or IP address for apache httpd front-end server

#       example: export ESGF_HOSTNAME=my.esgf.node

#       example: export ESGF_HOSTNAME=`docker-machine ip`

# ESGF_VERSION: version of ESGF/Docker distribution

#       example: export ESGF_VERSION=1.0



version: '2'





services:



  # data container holding site-specific ESGF configuration

  esgf-config:

    image: centos:centos6.7

    image: centos:6

    container_name: esgf-config

    volumes:

     - $ESGF_CONFIG/httpd/certs/:/etc/certs/
@@ -24,7 +25,7 @@ services: 
     - $ESGF_CONFIG/esg/config/tomcat/esg-truststore.ts:/usr/java/latest/jre/lib/security/jssecacerts



  esgf-solr:

    image: esgfhub/esgf-solr

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

    container_name: solr

    expose:

      - "8983"
@@ -41,7 +42,7 @@ services: 
      - default



  esgf-index-node:

    image: esgfhub/esgf-index-node

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

    container_name: index-node

    expose:

      - "8080"
@@ -57,7 +58,7 @@ services: 
      - default



  esgf-httpd:

   image: esgfhub/esgf-httpd

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

   container_name: httpd

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

   volumes_from:

docker-compose-solr-cloud.yml

+8 −5
Original line number Diff line number Diff line 
# docker-compose file for setting up an ESGF Solr Cloud

#

# ESGF_VERSION: version of ESGF/Docker distribution

#       example: export ESGF_VERSION=1.0



version: '2'
@@ -6,7 +9,7 @@ services: 


  # data container holding site-specific ESGF configuration

  esgf-config:

    image: centos:centos6.7

    image: centos:6

    container_name: esgf-config

    volumes:

     # esgf.properties
@@ -21,7 +24,7 @@ services: 
  # note: use service name='esgf-solr' to match value of property used by esgf-search to connect to solr:

  # esg.search.solr.query.url=http://esgf-solr:8983/solr

  esgf-solr:

    image: esgfhub/esgf-solr-cloud

    image: esgfhub/esgf-solr-cloud:${ESGF_VERSION}

    container_name: esgf-solr

    ports:

      - "8983:8983"
@@ -36,7 +39,7 @@ services: 


  # other node with 3 Solr instances

  esgf-solr2:

    image: esgfhub/esgf-solr-cloud

    image: esgfhub/esgf-solr-cloud:${ESGF_VERSION}

    container_name: esgf-solr2

    expose:

      - "8983"
@@ -53,7 +56,7 @@ services: 


  # ESGF search web application

  esgf-index-node:

    image: esgfhub/esgf-index-node

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

    container_name: index-node

    expose:

      - "8080"
@@ -71,7 +74,7 @@ services: 


  # apache httpd front-end

  esgf-httpd:

   image: esgfhub/esgf-httpd

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

   container_name: httpd

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

   volumes_from:

docker-compose.yml

+11 −9
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#       example: export ESGF_HOSTNAME=my.esgf.node

#       example: export ESGF_HOSTNAME=`docker-machine ip`

# ESGF_DATA_DIR: root of ESGF data directories

# ESGF_VERSION: version of ESGF/Docker distribution

#       example: export ESGF_VERSION=1.0



version: '2'
@@ -17,7 +19,7 @@ services: 


  # ESGF Data Node

  esgf-data-node:

    image: esgfhub/esgf-data-node

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

    container_name: data-node

    expose:

      - "8080"
@@ -39,7 +41,7 @@ services: 


  # ESGF Identity Provider

  esgf-idp-node:

    image: esgfhub/esgf-idp-node

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

    container_name: idp-node

    expose:

      - "8080"
@@ -58,7 +60,7 @@ services: 
  # data container holding site-specific ESGF configuration

  # this container stops after the volumes are initialized

  esgf-config:

    image: centos:centos6.7

    image: centos:6

    container_name: esgf-config

    volumes:

     - $ESGF_CONFIG/httpd/certs/:/etc/certs/
@@ -71,7 +73,7 @@ services: 


  # Solr engine running within Jetty

  esgf-solr:

    image: esgfhub/esgf-solr

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

    container_name: solr

    expose:

      - "8983"
@@ -86,7 +88,7 @@ services: 


  # ESGF Index Node

  esgf-index-node:

    image: esgfhub/esgf-index-node

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

    container_name: index-node

    expose:

      - "8080"
@@ -104,7 +106,7 @@ services: 


  # ESGF postgres database

  esgf-postgres:

     image: esgfhub/esgf-postgres

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

     expose:

       - "5432"

     ports:
@@ -118,7 +120,7 @@ services: 
  # data container to hold CoG source code and python virtual environment

  # this container stops after the volume 'cog_data' is initialized

  esgf-cog:

     image: esgfhub/esgf-cog

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

     container_name: cog

     expose:

       - "8000"
@@ -141,7 +143,7 @@ services: 




  esgf-httpd:

   image: esgfhub/esgf-httpd

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

   container_name: httpd

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

   volumes:
@@ -166,7 +168,7 @@ services: 


  # FTP server

  esgf-ftp:

   image: esgfhub/esgf-vsftp

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

   container_name: ftp 

   ports:

     - "21:21"