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

Fixing build problem.

parent 0c172708

dashboard/Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -6,10 +6,11 @@ 


ARG ESGF_IMAGES_HUB=esgfhub

ARG ESGF_VERSION=devel

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

FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION



MAINTAINER ESGF <esgf-devel@lists.llnl.gov>



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

ENV DASHBOARD_HOME /usr/local/esgf-dashboard-ip



# install library dependencies

idp-node/Dockerfile

+5 −0
Original line number Diff line number Diff line
@@ -3,9 +3,14 @@ 


ARG ESGF_IMAGES_HUB=esgfhub

ARG ESGF_VERSION=devel



FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION



MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>



# default ESGF repository

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



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

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

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

index-node/Dockerfile

+2 −3
Original line number Diff line number Diff line
@@ -2,13 +2,12 @@ 


ARG ESGF_IMAGES_HUB=esgfhub

ARG ESGF_VERSION=devel

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

FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION

MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>



# ESGF esg-search web application



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

ADD $ESGF_REPO/dist/esg-search/esg-search.war /usr/local/tomcat/webapps/esg-search/



#COPY esg-search.war /usr/local/tomcat/webapps/.

RUN cd /usr/local/tomcat/webapps/esg-search/ && \

    jar xvf esg-search.war && \

orp/Dockerfile

+4 −2
Original line number Diff line number Diff line
@@ -2,11 +2,13 @@ 


ARG ESGF_IMAGES_HUB=esgfhub

ARG ESGF_VERSION=devel

# default ESGF repository

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



FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION

MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>



# default ESGF repository

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



RUN mkdir -p /usr/local/tomcat/webapps/esg-orp



ADD $ESGF_REPO/dist/esg-orp/esg-orp.war /usr/local/tomcat/webapps/esg-orp/

tds/Dockerfile

+5 −2
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ 


ARG ESGF_IMAGES_HUB=esgfhub

ARG ESGF_VERSION=devel

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



FROM $ESGF_IMAGES_HUB/esgf-tomcat:$ESGF_VERSION

MAINTAINER Earth System Grid Federation <esgf-devel@lists.llnl.gov>



# default ESGF repository

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



#============================================



# update system libraries
@@ -15,7 +18,7 @@ RUN yum -y update; yum clean all 
# install TDS

RUN mkdir -p /usr/local/tomcat/webapps/thredds

#COPY thredds/thredds.war /usr/local/tomcat/webapps/thredds/thredds.war

ADD $ESGF_REPO/dist/thredds/5.0/5.0.2/thredds.war /usr/local/tomcat/webapps/thredds/

ADD http://aims1.llnl.gov/esgf/dist/thredds/5.0/5.0.2/thredds.war /usr/local/tomcat/webapps/thredds

RUN cd /usr/local/tomcat/webapps/thredds && \

    jar xvf thredds.war && \

    rm thredds.war && \