diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2020-09-21 22:13:05 +0200 |
|---|---|---|
| committer |   Michael Morris <michael.morris@est.tech> | 2021-05-12 10:27:10 +0000 |
| commit | df353be353e1ec25ac2a0e64a9eb617dcbc87703 (patch) | |
| tree | e79c636bc4f67bdd8392b24c85f2f6cb26e3c67a /catalog-be/src/main/docker/backend/startup.sh | |
| parent | 936781153118364e60662529dbd7217416a26148 (diff) | |
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>
Diffstat (limited to 'catalog-be/src/main/docker/backend/startup.sh')
| -rw-r--r-- | catalog-be/src/main/docker/backend/startup.sh | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/catalog-be/src/main/docker/backend/startup.sh b/catalog-be/src/main/docker/backend/startup.sh index 0dc54a8849..50f2e3d370 100644 --- a/catalog-be/src/main/docker/backend/startup.sh +++ b/catalog-be/src/main/docker/backend/startup.sh @@ -1,27 +1,21 @@ #!/bin/sh -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 \ +export JAVA_OPTIONS="$JAVA_OPTIONS -Dconfig.home=$JETTY_BASE/config \ + -Dcom.datastax.driver.USE_NATIVE_CLOCK=false \ + -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=z+KEj;t+,KN^iimSiS89e#p0 \ - -Djetty.console-capture.dir=${JETTY_BASE}/logs \ - ${JAVA_OPTIONS} " + -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} -status=$? -if [ $status -ne 0 ]; then - echo "[ERROR] Problem detected while running chef. Aborting !" - exit 1 -fi - # Execute Jetty -cd /var/lib/jetty +cd $JETTY_HOME java $JAVA_OPTIONS -jar "$JETTY_HOME/start.jar" |