Commit 83e8abac authored by Luca Cinquini's avatar Luca Cinquini
Browse files

Updating data node image to fetch jar NOT from local directory.

parent 8903014b

data-node/Dockerfile

+48 −9
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# o ESGF publisher client (which needs access to the TDS file system)

# o ORP



FROM esgfhub/esgf-tomcat:1.1

FROM esgfhub/esgf-tomcat:1.2



MAINTAINER Luca Cinquini <luca.cinquini@jpl.nasa.gov>
@@ -57,8 +57,8 @@ ENV ESGINI /esg/config/esgcet/esg.ini 
# ESGF ORP

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



COPY esgf-orp/esg-orp.war /usr/local/tomcat/webapps/esg-orp/esg-orp.war

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

#COPY esgf-orp/esg-orp.war /usr/local/tomcat/webapps/esg-orp/esg-orp.war

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

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

    jar xvf esg-orp.war && \

    rm esg-orp.war && \
@@ -70,11 +70,20 @@ COPY esgf-orp/conf/esg-orp.properties /usr/local/tomcat/webapps/esg-orp/WEB-INF/ 


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



# ESGF OLD NODE MANAGER

# uset to extract dependency jars

RUN mkdir -p /usr/local/tomcat/webapps/esgf-node-manager

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

RUN cd /usr/local/tomcat/webapps/esgf-node-manager/ && \

    jar xvf esgf-node-manager.war



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



# TDS



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

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

#ADD $ESGF_REPO/dist/devel/thredds/5.0/5.0.0/thredds.war /usr/local/tomcat/webapps/thredds/

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

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

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

    jar xvf thredds.war && \

    rm thredds.war && \
@@ -95,14 +104,41 @@ RUN mkdir -p /esg/content/thredds/esgcet 
COPY thredds/conf/applicationContext.xml /usr/local/tomcat/webapps/thredds/WEB-INF/applicationContext.xml



# TDS jars necessary to support ESGF security filters

COPY  thredds/jars/*  $CATALINA_HOME/webapps/thredds/WEB-INF/lib/

# some jars are retrieved from the ESGF repository

# other jars are copied from the unpacked ORP or NM distributions

#COPY  thredds/jars/*  $CATALINA_HOME/webapps/thredds/WEB-INF/lib/



ADD $ESGF_REPO/dist/devel/filters/XSGroupRole-1.0.0.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/XSGroupRole-1.0.0.jar

ADD $ESGF_REPO/dist/devel/filters/commons-httpclient-3.1.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/commons-httpclient-3.1.jar

ADD $ESGF_REPO/dist/devel/filters/commons-lang-2.6.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/commons-lang-2.6.jar

ADD $ESGF_REPO/dist/devel/esg-orp/esg-orp-2.9.3.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esg-orp-2.9.3.jar

ADD $ESGF_REPO/dist/devel/esgf-node-manager/esgf-node-manager-common-1.0.0.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esgf-node-manager-common-1.0.0.jar

ADD $ESGF_REPO/dist/devel/esgf-node-manager/esgf-node-manager-filters-1.0.0.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esgf-node-manager-filters-1.0.0.jar

ADD $ESGF_REPO/dist/devel/esgf-security/esgf-security-2.7.10.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esgf-security-2.7.10.jar

ADD $ESGF_REPO/dist/devel/filters/jdom-legacy-1.1.3.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/jdom-legacy-1.1.3.jar

ADD $ESGF_REPO/dist/devel/filters/opensaml-2.3.2.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/opensaml-2.3.2.jar

ADD $ESGF_REPO/dist/devel/filters/openws-1.3.1.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/openws-1.3.1.jar

ADD $ESGF_REPO/dist/devel/filters/xmltooling-1.2.2.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/xmltooling-1.2.2.jar



RUN cp /usr/local/tomcat/webapps/esg-orp/WEB-INF/lib/serializer-2.9.1.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/serializer-2.9.1.jar

RUN cp /usr/local/tomcat/webapps/esg-orp/WEB-INF/lib/velocity-1.5.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/velocity-1.5.jar

RUN cp /usr/local/tomcat/webapps/esg-orp/WEB-INF/lib/xalan-2.7.2.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/xalan-2.7.2.jar

RUN cp /usr/local/tomcat/webapps/esg-orp/WEB-INF/lib/xercesImpl-2.10.0.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/xercesImpl-2.10.0.jar

RUN cp /usr/local/tomcat/webapps/esg-orp/WEB-INF/lib/xml-apis-1.4.01.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/xml-apis-1.4.01.jar

RUN cp /usr/local/tomcat/webapps/esg-orp/WEB-INF/lib/xmlsec-1.4.2.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/xmlsec-1.4.2.jar

RUN cp /usr/local/tomcat/webapps/esg-orp/WEB-INF/lib/log4j-1.2.17.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/log4j-1.2.17.jar

RUN cp /usr/local/tomcat/webapps/esg-orp/WEB-INF/lib/commons-io-2.4.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/commons-io-2.4.jar



RUN cp /usr/local/tomcat/webapps/esgf-node-manager/WEB-INF/lib/commons-dbcp-1.4.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/commons-dbcp-1.4.jar

RUN cp /usr/local/tomcat/webapps/esgf-node-manager/WEB-INF/lib/commons-dbutils-1.3.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/commons-dbutils-1.3.jar

RUN cp /usr/local/tomcat/webapps/esgf-node-manager/WEB-INF/lib/commons-pool-1.5.4.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/commons-pool-1.5.4.jar

RUN cp /usr/local/tomcat/webapps/esgf-node-manager/WEB-INF/lib/postgresql-8.4-703.jdbc3.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/postgresql-8.4-703.jdbc3.jar



# TDS customized logging (uses DEBUG)

COPY thredds/conf/log4j2.xml /usr/local/tomcat/webapps/thredds/WEB-INF/classes/log4j2.xml



# data node scripts

COPY scripts/ /usr/local/bin/

RUN chmod +x /usr/local/bin/change_data_node_password.sh



# TDS test ESGF catalogs

# COPY esgf-content/thredds/ /esg/content/thredds/
@@ -113,6 +149,9 @@ RUN chmod +x /usr/local/bin/change_data_node_password.sh 
# change ownership of content directory

RUN chown -R tomcat:tomcat  /esg/content/thredds/



# cleanup

RUN rm -rf /usr/local/tomcat/webapps/esgf-node-manager/



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



# Dashboard
@@ -134,8 +173,8 @@ RUN mkdir -p /usr/local/geoip/share/GeoIP && \ 
     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/devel/esgf-stats-api/esgf-stats-api.war /usr/local/tomcat/webapps/esgf-stats-api/esgf-stats-api.war

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

ADD $ESGF_REPO/dist/devel/esgf-stats-api/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 && \

data-node/scripts/change_data_node_password.sh

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file