From: Victor Gao <victor.gao@huawei.com>
Date: Wed, 25 Jul 2018 10:39:20 +0000 (+0800)
Subject: Upgrade tomcat in vnfsdk into stable version
X-Git-Tag: 1.2.0~21
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F57483%2F1;p=vnfsdk%2Frefrepo.git

Upgrade tomcat in vnfsdk into stable version

vnfsdk use the fixed tomcat version v8.5.30

Issue-ID: VNFSDK-293

Change-Id: Ia66afe4b7a9d9ddac6e2be1a7031d72cd142b96b
Signed-off-by: Victor Gao <victor.gao@huawei.com>
---

diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
index 82bd3960..270b1217 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
@@ -47,7 +47,7 @@ RUN add-apt-repository ppa:openjdk-r/ppa -y && \
 
 
 # Set up tomcat
-RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v8.5.32/bin/apache-tomcat-8.5.32.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.32.tar.gz && rm -f apache-tomcat-8.5.32.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT
+RUN wget -q https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.30/bin/apache-tomcat-8.5.30.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.30.tar.gz && rm -f apache-tomcat-8.5.30.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT
 RUN echo 'export CATALINA_OPTS="$CATALINA_OPTS -Xms64m -Xmx256m -XX:MaxPermSize=64m"' > /service/bin/setenv.sh
 ENV CATALINA_HOME /service