diff options
author | ys9693 <ys9693@att.com> | 2020-01-19 13:50:02 +0200 |
---|---|---|
committer | Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-01-22 12:33:31 +0000 |
commit | 16a9fce0e104a38371a9e5a567ec611ae3fc7f33 (patch) | |
tree | 03a2aff3060ddb5bc26a90115805a04becbaffc9 /catalog-be/sdc-backend/startup.sh | |
parent | aa83a2da4f911c3ac89318b8e9e8403b072942e1 (diff) |
Catalog alignment
Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe
Diffstat (limited to 'catalog-be/sdc-backend/startup.sh')
-rw-r--r-- | catalog-be/sdc-backend/startup.sh | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/catalog-be/sdc-backend/startup.sh b/catalog-be/sdc-backend/startup.sh index 77d4dd5e6a..e41aff40f0 100644 --- a/catalog-be/sdc-backend/startup.sh +++ b/catalog-be/sdc-backend/startup.sh @@ -1,20 +1,31 @@ #!/bin/sh -JAVA_OPTIONS=" ${JAVA_OPTIONS} \ - -Dconfig.home=${JETTY_BASE}/config -Dlog.home=${JETTY_BASE}/logs \ - -Dlogback.configurationFile=${JETTY_BASE}/config/catalog-be/logback.xml \ - -Dconfiguration.yaml=${JETTY_BASE}/config/catalog-be/configuration.yaml \ - -Donboarding_configuration.yaml=${JETTY_BASE}/config/onboarding-be/onboarding_configuration.yaml \ - -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \ - -Djavax.net.ssl.trustStorePassword=].][xgtze]hBhz*wy]}m#lf* \ - -Djetty.console-capture.dir=${JETTY_BASE}/logs" +export JAVA_OPTIONS=" -Dconfig.home=${JETTY_BASE}/config \ + -Dlog.home=${JETTY_BASE}/logs \ + -Dlogback.configurationFile=${JETTY_BASE}/config/catalog-be/logback.xml \ + -Dconfiguration.yaml=${JETTY_BASE}/config/catalog-be/configuration.yaml \ + -Dartifactgenerator.config=${JETTY_BASE}/config/catalog-be/Artifact-Generator.properties \ + -Donboarding_configuration.yaml=${JETTY_BASE}/config/onboarding-be/onboarding_configuration.yaml \ + -Djavax.net.ssl.trustStore=${JETTY_BASE}/etc/org.onap.sdc.trust.jks \ + -Djavax.net.ssl.trustStorePassword=].][xgtze]hBhz*wy]}m#lf* \ + -Djetty.console-capture.dir=${JETTY_BASE}/logs \ + ${JAVA_OPTIONS} " cd /root/chef-solo chef-solo -c solo.rb -E ${ENVNAME} +status=$? +if [ $status != 0 ]; then + echo "[ERROR] Problem detected while running chef. Aborting !" + exit 1 +fi + +# Execute Jetty cd /var/lib/jetty /docker-entrypoint.sh & +exec "$@"; + while true; do sleep 2; done |