Commit cebc8f99 authored by William Hill's avatar William Hill Committed by William Hill
Browse files

pull assets from GitHub for dashboard and idp

parent 13a2e0c4

dashboard/Dockerfile

+10 −5
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ 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

ARG DASHBOARD_VERSION=v1.5.25

ARG DASHBOARD_REPO=https://github.com/ESGF/esgf-dashboard/releases/download/$DASHBOARD_VERSION



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



# install library dependencies
@@ -22,14 +24,17 @@ RUN yum install -y libxml2-devel libxslt-devel \ 
RUN yum clean all



# install additional GeoLiteCity database

ADD $ESGF_REPO/dist/geoip/GeoLiteCity.dat.gz /tmp/GeoLiteCity.dat.gz

ADD $DASHBOARD_REPO/GeoLiteCity.dat.gz /tmp/GeoLiteCity.dat.gz

RUN mkdir -p /usr/local/geoip/share/GeoIP && \

     cd /tmp && \

     gunzip -c GeoLiteCity.dat.gz > /usr/local/geoip/share/GeoIP/GeoLiteCity.dat



# install esgf-stats-api war file

#COPY dashboard/esgf-stats-api.war /usr/local/tomcat/webapps/esgf-stats-api/esgf-stats-api.war

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

ARG STATS_API_VERSION=v1.0.9

ARG STATS_API_REPO=https://github.com/ESGF/esgf-stats-api/releases/download/$STATS_API_VERSION

ADD $STATS_API_REPO/esgf-stats-api.war /usr/local/tomcat/webapps/esgf-stats-api/esgf-stats-api.war



RUN cd /usr/local/tomcat/webapps/esgf-stats-api && \

    jar xvf esgf-stats-api.war && \

    rm esgf-stats-api.war && \

idp-node/Dockerfile

+4 −2
Original line number Diff line number Diff line
@@ -27,11 +27,13 @@ FROM ${ESGF_HUB}/${ESGF_PREFIX}configure:${ESGF_VERSION} as configuration 
FROM openjdk:8-jdk AS esgf-idp-unpack



# Download and unpack esg-orp war

ARG ESGF_REPO=http://dist.ceda.ac.uk/esgf/dist

ARG IDP_VERSION=v2.8.8

ARG IDP_REPO=https://github.com/ESGF/esgf-idp/releases/download/$IDP_VERSION



RUN mkdir /opt/esgf-idp && \

    cd /opt/esgf-idp && \

    TMPFILE=$(mktemp) && \

    curl -o $TMPFILE -fsSL $ESGF_REPO/esgf-idp/esgf-idp.war && \

    curl -o $TMPFILE -fsSL $IDP_REPO/esgf-idp.war && \

    jar xvf $TMPFILE && \

    chmod -R g+w /opt/esgf-idp