Commit 8dcab65e authored by spetruzza's avatar spetruzza
Browse files

adding visus

parent 6b00bf48

docker-compose.yml

+12 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ services: 
      ESGF_IDP_UPSTREAM: http://esgf-idp-node:8080

      ESGF_SLCS_UPSTREAM: http://esgf-slcs:8000

      ESGF_AUTH_UPSTREAM: http://esgf-auth:8000

      ESGF_VISUS_UPSTREAM: http://esgf-visus:8080

    depends_on:

      - esgf-solr-slave

      - esgf-index-node
@@ -99,6 +100,7 @@ services: 
      - esgf-slcs

      - esgf-auth

      - esgf-cog

      - esgf-visus



  esgf-solr-master:

    image: "${ESGF_HUB}/${ESGF_PREFIX}solr:${ESGF_VERSION}"
@@ -108,6 +110,15 @@ services: 
    volumes:

      - "solr-master-home:/esg/solr-home"



  esgf-visus:

    image: "visus/ondemand"

    restart: always  

    ports:

      - "8080:80"

    #  - "42299:42299"

    volumes:

      - "visus:/esg/visus-home"



  esgf-solr-slave:

    image: "${ESGF_HUB}/${ESGF_PREFIX}solr:${ESGF_VERSION}"

    restart: always
@@ -368,3 +379,4 @@ volumes: 
  postgres-slcs-data:

  tds-content:

  slcs-trustroots:

  visus:

proxy/conf/esgf.conf

+10 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ server { 
        proxy_pass $tds_upstream;

    }

    {{- end }}



}
@@ -150,6 +151,15 @@ server { 
    }

    {{- end }}



    {{ $visus_upstream := getenv "ESGF_VISUS_UPSTREAM" -}}

    {{ if $visus_upstream -}}

    set $visus_upstream {{ $visus_upstream }};

    location /esgf-visus {

        proxy_pass $visus_upstream;

        rewrite ^/esgf-visus(.*)$ $1 last;

    }

    {{- end }}



    {{ $auth_upstream := getenv "ESGF_AUTH_UPSTREAM" -}}

    {{ if $auth_upstream -}}

    set $auth_upstream {{ $auth_upstream }};

publisher/Dockerfile

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ RUN groupadd -g $PUBLISH_GID $PUBLISH_GROUP && \ 
ENV ESGINI /esg/config/esgcet/esg.ini

ENV UVCDAT_ANONYMOUS_LOG no



RUN apt-get update && \

    apt-get install -y gcc



# Install packages using conda and pip

RUN conda install -y -c conda-forge -c uvcdat \

      gcc_linux-64 \