Upgrade tomcat-version-9.0.36 fix vulnerabilities.

[policy/engine.git] / packages / docker / src / main / docker / docker-install.sh

diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index 7176abf..54841e3 100644 (file)
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -3,7 +3,7 @@
 #============LICENSE_START==================================================
 #  ONAP Policy Engine
 #===========================================================================
-#  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+#  Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
 #===========================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -405,11 +405,10 @@ function configure_keystore() {
                set -x
        fi
 
-    local DEFAULT_KEYSTORE_PASSWORD="Pol1cy_0nap"
     local DEFAULT_KEYSTORE_PASSWORD='Pol1cy_0nap'
 
        if [[ -n ${TRUSTSTORE_PASSWD} ]]; then
-           keytool -storepasswd -storepass "${DEFAULT_TRUSTSTORE_PASSWORD}" -keystore "${POLICY_HOME}/etc/ssl/policy-truststore" -new "${TRUSTSTORE_PASSWD}"
+           keytool -storepasswd -storepass "${DEFAULT_KEYSTORE_PASSWORD}" -keystore "${POLICY_HOME}/etc/ssl/policy-truststore" -new "${TRUSTSTORE_PASSWD}"
            keytool -list -keystore "${POLICY_HOME}/etc/ssl/policy-truststore" -storepass "${TRUSTSTORE_PASSWD}"
        fi
 
@@ -556,9 +555,9 @@ function install_brmsgw() {
        
        install_prereqs "${BASE_CONF}"
 
-       if [[ -n ${BUILD_VERSION} ]]; then
-               echo "Replacing ${BUILD_VERSION} in ${COMPONENT_TYPE}.conf"
-               sed -i -e "s/^BRMS_DEPENDENCY_VERSION=.*$/BRMS_DEPENDENCY_VERSION=${BUILD_VERSION}/g" "${COMPONENT_TYPE}.conf"
+       if [[ -n ${BUILD_VERSION_ENGINE} ]]; then
+               echo "Replacing ${BUILD_VERSION_ENGINE} in ${COMPONENT_TYPE}.conf"
+               sed -i -e "s/^BRMS_DEPENDENCY_VERSION=.*$/BRMS_DEPENDENCY_VERSION=${BUILD_VERSION_ENGINE}/g" "${COMPONENT_TYPE}.conf"
        fi
        
        if ! process_configuration "${COMPONENT_TYPE}.conf"; then
@@ -629,7 +628,7 @@ DEBUG=n
 
 BASE_CONF=base.conf
 
-TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.53
+TOMCAT_PACKAGE_NAME=apache-tomcat-9.0.36
 
 INSTALL_DIR="$(pwd)"