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

Upgrading the IDP

parent 746f172a

docker-compose.yml

+16 −16
Original line number Diff line number Diff line
@@ -73,22 +73,22 @@ services: 




  # ESGF Identity Provider

  #esgf-idp-node:

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

  #  container_name: idp-node

  #  expose:

  #    - "8080"

  #    - "8443"

  #  ports:

  #    - "8082:8080"

  #    - "8445:8443"

  #  networks:

  #    - default

  #    - dbnetwork

  #  volumes_from:

  #    - esgf-config

  #  depends_on:

  #    - esgf-postgres

  esgf-idp-node:

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

    container_name: idp-node

    expose:

      - "8080"

      - "8443"

    ports:

      - "8082:8080"

      - "8445:8443"

    networks:

      - default

      - dbnetwork

    volumes_from:

      - esgf-config

    depends_on:

      - esgf-postgres



  # Solr engine running within Jetty

  esgf-solr:

idp-node/Dockerfile

+1 −2
Original line number Diff line number Diff line 
# ESGF Identity Provider node

# Implemented as Java web servlet application running inside Tomcat container.



FROM esgfhub/esgf-tomcat:1.1

FROM esgfhub/esgf-tomcat:1.2



MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>



# ESGF esg-idp web application

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



# FIXME

ADD $ESGF_REPO/dist/devel/esgf-idp/esgf-idp.war /usr/local/tomcat/webapps/esgf-idp/

#COPY esgf-idp.war /usr/local/tomcat/webapps/esgf-idp/

RUN cd /usr/local/tomcat/webapps/esgf-idp/ && \