Commit da2c19db authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Adding separate ORP container.

parent 6cf78dad

docker-stack.yml

+22 −2
Original line number Diff line number Diff line
@@ -204,11 +204,31 @@ services: 
      placement:

        constraints: [node.labels.esgf_idp_node == true]



  esgf-data-node:

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

  esgf-orp:

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

    ports:

      - "8083:8080"

      - "8446:8443"

    networks:

      - default

    secrets:

      - source: tomcat_esg-truststore_ts

        target: /usr/java/latest/jre/lib/security/jssecacerts

      - source: esgf_config_files

        target: /root/archives/esgf_config.tar.xz

        mode:   0600

    environment:

     - ESGF_HOSTNAME

    deploy:

      replicas: 1

      placement:

        constraints: [node.labels.esgf_data_node == true]



  esgf-tds:

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

    ports:

      - "8084:8080"

      - "8447:8443"

    networks:

      - default

      - dbnetwork

scripts/common

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ readonly CANCEL_CODE=2 
readonly DEFAULT_IMAGES_HUB=${ESGF_IMAGES_HUB-esgfhub}

readonly DEFAULT_PACKAGE_REPO=${ESGF_REPO-"http://distrib-coffee.ipsl.jussieu.fr/pub/esgf"}



readonly ESGF_IMAGE_DIR_NAMES=('node' 'postgres' 'tomcat' 'solr' 'httpd' 'cog' 'data-node' 'idp-node' 'index-node' 'slcs' 'auth' 'node-manager' 'vsftp' 'solr-cloud')

#readonly ESGF_IMAGE_DIR_NAMES=('node' 'postgres' 'tomcat' 'solr' 'httpd' 'cog' 'data-node' 'idp-node' 'index-node' 'slcs' 'auth' 'node-manager' 'vsftp' 'solr-cloud')

readonly ESGF_IMAGE_DIR_NAMES=('node' 'postgres' 'tomcat' 'solr' 'httpd' 'cog' 'tds' 'orp' 'idp-node' 'index-node' 'slcs' 'auth')



readonly ESGF_IMAGE_PREFIX='esgf-'

scripts/setup_swarm_macosx_1.sh

0 → 100755
+27 −0
Original line number Diff line number Diff line 
#!/bin/sh

# 

# Script to setup a Docker Swarm composed of 1 single node on a MacOSX laptop.



# create all VMs

docker-machine create --driver virtualbox --virtualbox-memory 2048 node1

docker-machine ls



# start the swarm

eval $(docker-machine env node1)

export MANAGER_IP=`docker-machine ip node1`

docker swarm init --advertise-addr $MANAGER_IP

token_worker=`docker swarm join-token --quiet worker`

token_manager=`docker swarm join-token --quiet manager`



# drain the swarm manager to prevent assigment of tasks

#docker node update --availability drain node1



# assign functional labels to the single node

eval $(docker-machine env node1)

docker node ls

docker node update --label-add esgf_front_node=true node1

docker node update --label-add esgf_db_node=true node1

docker node update --label-add esgf_index_node=true node1

docker node update --label-add esgf_idp_node=true node1

docker node update --label-add esgf_solr_node=true node1

docker node update --label-add esgf_data_node=true node1

scripts/setup_swarm_macosx_2.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/sh

# 

# Script to setup a Docker Swarm composed of 6 nodes on a MacOSX laptop.

# Script to setup a Docker Swarm composed of 2 nodes on a MacOSX laptop.



# create all VMs

# (assign more memory to last node which will be the data-node)