commit df353be353e1ec25ac2a0e64a9eb617dcbc87703
author sebdet <sebastien.determe@intl.att.com> Mon Sep 21 22:13:05 2020 +0200
committer Michael Morris <michael.morris@est.tech> Wed May 12 10:27:10 2021 +0000
tree e79c636bc4f67bdd8392b24c85f2f6cb26e3c67a
parent 936781153118364e60662529dbd7217416a26148

Use integration-java11 Dockerfile

Use onap/integration-java11:7.1.0 as a source for the images requiring JDK 11 in SDC

Issue-ID: SDC-3298
Change-Id: Ifee3d2942dcb9c078f2ebb686bdabc0ecca857b3
Signed-off-by: xuegao <xue.gao@intl.att.com>

catalog-fe/sdc-frontend/startup.sh

diff --git a/catalog-fe/sdc-frontend/startup.sh b/catalog-fe/sdc-frontend/startup.sh
index b2443f1..5a1dd27 100644
--- a/catalog-fe/sdc-frontend/startup.sh
+++ b/catalog-fe/sdc-frontend/startup.sh
@@ -1,18 +1,18 @@
 #!/bin/sh
 
-JAVA_OPTIONS=" ${JAVA_OPTIONS} \
-               -Dconfig.home=${JETTY_BASE}/config \
-               -Dlog.home=${JETTY_BASE}/logs \
-               -Dlogback.configurationFile=${JETTY_BASE}/config/catalog-fe/logback.xml \
-               -Dconfiguration.yaml=${JETTY_BASE}/config/catalog-fe/configuration.yaml \
-               -Donboarding_configuration.yaml=${JETTY_BASE}/config/onboarding-fe/onboarding_configuration.yaml \
-               -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \
+JAVA_OPTIONS="$JAVA_OPTIONS \
+               -Dconfig.home=$JETTY_BASE/config \
+               -Dlog.home=$JETTY_BASE/logs \
+               -Dlogback.configurationFile=$JETTY_BASE/config/catalog-fe/logback.xml \
+               -Dconfiguration.yaml=$JETTY_BASE/config/catalog-fe/configuration.yaml \
+               -Donboarding_configuration.yaml=$JETTY_BASE/config/onboarding-fe/onboarding_configuration.yaml \
+               -Djavax.net.ssl.trustStore=$JETTY_BASE/etc/org.onap.sdc.trust.jks \
                -Djavax.net.ssl.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 \
-               -Djetty.console-capture.dir=${JETTY_BASE}/logs "
+               -Djetty.console-capture.dir=$JETTY_BASE/logs"
 
-cd /var/lib/jetty/chef-solo
+cd $JETTY_BASE/chef-solo
 chef-solo -c solo.rb -E ${ENVNAME}
 
-cd /var/lib/jetty
+cd $JETTY_HOME
 
-java $JAVA_OPTIONS -jar "$JETTY_HOME/start.jar"
+java $JAVA_OPTIONS -jar "${JETTY_HOME}/start.jar"