Code Review / vfc / nfvo / driver / vnfm / svnfm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: c62bc0d)
Update tomcat to v8.5.29 85/37685/1
authorluxin <luxin7@huawei.com>
Thu, 22 Mar 2018 06:40:00 +0000 (14:40 +0800)
committerluxin <luxin7@huawei.com>
Thu, 22 Mar 2018 06:40:00 +0000 (14:40 +0800)
Change-Id: If747f9ff5c23a21102690618e62b186f012ddc13
Issue-ID: VFC-788
Signed-off-by: luxin <luxin7@huawei.com>
huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile patch | blob | history
nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile patch | blob | history

diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
index 4b24b49..4bdfeba 100644 (file)
--- 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.28/bin/apache-tomcat-8.5.28.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.28.tar.gz && rm -f apache-tomcat-8.5.28.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT
+RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v8.5.29/bin/apache-tomcat-8.5.29.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.29.tar.gz && rm -f apache-tomcat-8.5.29.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 7ed3275..fa9c505 100755 (executable)
--- 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.28/bin/apache-tomcat-8.5.28.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.28.tar.gz && rm -f apache-tomcat-8.5.28.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT
+RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v8.5.29/bin/apache-tomcat-8.5.29.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.29.tar.gz && rm -f apache-tomcat-8.5.29.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
 
Specific VNFM drivers