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

Updating the node manager.

parent e8b20164

docker-compose.yml

+13 −13
Original line number Diff line number Diff line
@@ -179,19 +179,19 @@ services: 
         - "${ESGF_HOSTNAME}"

     dbnetwork: {}



  #esgf-node-manager:

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

  # container_name: node-manager

  # volumes_from:

  #   - esgf-config

  # environment:

  #   - SSL_CERT_DIR=/etc/grid-security/certificates

  #   - ESGF_HOSTNAME

  # depends_on:

  #   - esgf-postgres

  # networks:

  #   default: {}

  #   dbnetwork: {}

  esgf-node-manager:

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

   container_name: node-manager

   volumes_from:

     - esgf-config

   environment:

     - SSL_CERT_DIR=/etc/grid-security/certificates

     - ESGF_HOSTNAME

   depends_on:

     - esgf-postgres

   networks:

     default: {}

     dbnetwork: {}



  # FTP server

  #esgf-ftp:

node-manager/Dockerfile

+2 −3
Original line number Diff line number Diff line
@@ -9,14 +9,14 @@ 
# 60 for a full node

# 36 for a data node

#

# outout files:

# output files:

# /esg/config/registration.xml

# /esg/log : contains log files

# /esg/tasks : contains update task files in jsoon format

# /esg/config/nm.properties 

# /esg/config/esgf_nodemgr_map.json : periodically updated to reflect nodes status



FROM esgfhub/esgf-node:1.1

FROM esgfhub/esgf-node:1.2



MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>
@@ -40,7 +40,6 @@ RUN cd $INST_DIR && \ 
    git  clone https://github.com/ESGF/esgf-node-manager.git && \

    cd esgf-node-manager && \

    git checkout devel

#   git checkout docker



# install dependencies in Python virtual environment

RUN source $PYTHON_VENV/bin/activate && \