summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluxin <luxin7@huawei.com>2017-12-13 17:29:14 +0800
committerlu xin <luxin7@huawei.com>2017-12-15 06:55:31 +0000
commita1fa43b513dcf453e40c7befc64b023e935abcf3 (patch)
treedef7c1fd6de757c27409ae8dedf009021966e206
parent2f0568aa5eea8bd99a31ef5b20e9c22c123a25a1 (diff)
Change tomcat download url in Dockerfile
Change-Id: I0fa9b2bef59b57450b96a5df985e1f772280b942 Issue-ID: VFC-619 Signed-off-by: luxin <luxin7@huawei.com> (cherry picked from commit ca765f92fea3d438ca39f33756551ea3a478bbcd)
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile2
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
index 4d6e0f26..35d31c05 100644
--- a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
@@ -29,7 +29,7 @@ COPY init-mysql.sh .
# 30-tomcat.txt - AUTOGENERATED, DO NOT MODIFY MANUALLY
# Set up tomcat
-RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.23.tar.gz && rm -f apache-tomcat-8.5.23.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT
+RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.24.tar.gz && rm -f apache-tomcat-8.5.24.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
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
index 05d261a9..85078d89 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
@@ -31,7 +31,7 @@ COPY init-mysql.sh .
# 30-tomcat.txt - AUTOGENERATED, DO NOT MODIFY MANUALLY
# Set up tomcat
-RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.23.tar.gz && rm -f apache-tomcat-8.5.23.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT
+RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v8.5.24/bin/apache-tomcat-8.5.24.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.24.tar.gz && rm -f apache-tomcat-8.5.24.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