Code Review / vfc / nfvo / driver / vnfm / svnfm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 2f0568a)
Change tomcat download url in Dockerfile 63/26363/1
authorluxin <luxin7@huawei.com>
Wed, 13 Dec 2017 09:29:14 +0000 (17:29 +0800)
committerlu xin <luxin7@huawei.com>
Fri, 15 Dec 2017 06:55:31 +0000 (06:55 +0000)
Change-Id: I0fa9b2bef59b57450b96a5df985e1f772280b942
Issue-ID: VFC-619
Signed-off-by: luxin <luxin7@huawei.com>
(cherry picked from commit ca765f92fea3d438ca39f33756551ea3a478bbcd)

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 4d6e0f2..35d31c0 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.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 05d261a..85078d8 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.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
 
Specific VNFM drivers