diff options
| author |   Gao Weitao <victor.gao@huawei.com> | 2018-03-05 10:26:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-05 10:26:25 +0000 |
| commit | 729c12f0145d4ac71e92545e7408379b48c8f389 (patch) | |
| tree | 47aa2f3215f53cc524b568007f0eb39a8db0207a | |
| parent | fb06463518117fbd5711755f5b4050aca88d45e7 (diff) | |
| parent | f3b0b07005a54ae74d14b49515a5db895cfd2225 (diff) | |
Merge "Update tomcat version"
| -rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile index 67ac2bb5..4b24b490 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.27/bin/apache-tomcat-8.5.27.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.27.tar.gz && rm -f apache-tomcat-8.5.27.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT +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 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 71b7fa32..7ed32757 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.27/bin/apache-tomcat-8.5.27.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.27.tar.gz && rm -f apache-tomcat-8.5.27.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT +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 echo 'export CATALINA_OPTS="$CATALINA_OPTS -Xms64m -Xmx256m -XX:MaxPermSize=64m"' > /service/bin/setenv.sh ENV CATALINA_HOME /service |