Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update docker script for tomcat install
[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
c15f36f
..
cd3e1f0
100644
(file)
--- a/
packages/docker/src/main/docker/docker-install.sh
+++ b/
packages/docker/src/main/docker/docker-install.sh
@@
-151,7
+151,6
@@
function configure_component() {
SED_LINE+=" -e 's!\${{KEYSTORE_PASSWD}}!${KEYSTORE_PASSWD}!g' "
SED_LINE+=" -e 's!\${{JAVA_HOME}}!${JAVA_HOME}!g' "
SED_LINE+=" -e 's!\${{COMPONENT_TYPE}}!${COMPONENT_TYPE}!g' "
SED_LINE+=" -e 's!\${{KEYSTORE_PASSWD}}!${KEYSTORE_PASSWD}!g' "
SED_LINE+=" -e 's!\${{JAVA_HOME}}!${JAVA_HOME}!g' "
SED_LINE+=" -e 's!\${{COMPONENT_TYPE}}!${COMPONENT_TYPE}!g' "
- SED_LINE+=" -e 's!\${{POLICY_LOGS}}!${POLICY_LOGS}!g' "
while read line || [ -n "${line}" ]; do
if [[ -n $line ]] && [[ $line != \#* ]]; then
while read line || [ -n "${line}" ]; do
if [[ -n $line ]] && [[ $line != \#* ]]; then
@@
-578,7
+577,7
@@
DEBUG=n
BASE_CONF=base.conf
BASE_CONF=base.conf
-TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.
23
+TOMCAT_PACKAGE_NAME=apache-tomcat-8.0.
50
INSTALL_DIR="$(pwd)"
INSTALL_DIR="$(pwd)"
@@
-659,12
+658,6
@@
if [[ -z ${POLICY_GROUP} ]]; then
exit 1
fi
exit 1
fi
-if [[ -z ${POLICY_LOGS} ]]; then
- echo "POLICY_LOGS environment variable NOT set, default to /var/log"
- export POLICY_LOGS="/var/log/onap"
-fi
-
-
FQDN=$(hostname -f 2> /dev/null)
if [[ $? != 0 || -z ${FQDN} ]]; then
echo "error: cannot determine the FQDN for this host $(hostname)."
FQDN=$(hostname -f 2> /dev/null)
if [[ $? != 0 || -z ${FQDN} ]]; then
echo "error: cannot determine the FQDN for this host $(hostname)."