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 /openecomp-be/dist/sdc-onboard-backend-docker/artifacts/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 'openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh')
| -rw-r--r-- | openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh index cf1b6227ad..7381d50dfe 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh @@ -1,21 +1,18 @@ #!/bin/sh -cd /var/lib/jetty/chef-solo -chef-solo -c solo.rb -E ${ENVNAME} -rc=$? -if [ $rc -ne 0 ]; then - echo "Chef exaction failed." - exit $rc; -fi +JAVA_OPTIONS="$JAVA_OPTIONS \ + -Dcom.datastax.driver.USE_NATIVE_CLOCK=false \ + -Dconfig.home=$JETTY_BASE/config \ + -Dlog.home=$JETTY_BASE/logs \ + -Dlogback.configurationFile=$JETTY_BASE/config/onboarding-be/logback.xml \ + -Dconfiguration.yaml=$JETTY_BASE/config/onboarding-be/onboarding_configuration.yaml \ + -Dconfig.location=$JETTY_BASE/config/onboarding-be/." +cd $JETTY_BASE -JAVA_OPTIONS=" ${JAVA_OPTIONS} \ - -Dconfig.home=${JETTY_BASE}/config \ - -Dlog.home=${JETTY_BASE}/logs \ - -Dlogback.configurationFile=${JETTY_BASE}/config/onboarding-be/logback.xml \ - -Dconfiguration.yaml=${JETTY_BASE}/config/onboarding-be/onboarding_configuration.yaml \ - -Dconfig.location=${JETTY_BASE}/config/onboarding-be/." +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" |