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

Fixing problems that prevent build.

parent fc75f908

node/Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ RUN yum -y install epel-release; yum clean all 
# see download string at: http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html

# run scripts/get_oracle_jdk_linux_x64.sh to identify the correct URL



ENV JAVA_VERSION 8u152

ENV JAVA_BUILD_VERSION b16

ENV JAVA_HASH=aa0333dd3019491ca4f6ddbe78cdb6d0

ENV JAVA_VERSION 8u162

ENV JAVA_BUILD_VERSION b12

ENV JAVA_HASH=0da788060d494f5095bf8624735fa2f1



RUN wget -q --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" \

    -O /tmp/jdk-8-linux-x64.rpm \

tds/Dockerfile

+1 −3
Original line number Diff line number Diff line
@@ -46,9 +46,7 @@ COPY conf/applicationContext.xml /usr/local/tomcat/webapps/thredds/WEB-INF/appli 
ADD $ESGF_REPO/dist/filters/XSGroupRole-1.0.0.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/XSGroupRole-1.0.0.jar

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

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

# FIXME

COPY etc/esg-orp-2.9.6.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esg-orp-2.9.6.jar

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

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

ADD $ESGF_REPO/dist/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/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/esgf-security/esgf-security-2.7.10.jar $CATALINA_HOME/webapps/thredds/WEB-INF/lib/esgf-security-2.7.15.jar