X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fbin%2Fstart.sh;h=19d2717b7a0d8a01fe421a93e884d6030061e08d;hb=refs%2Fchanges%2F29%2F118429%2F3;hp=1dedb25868482c4ede87ea785ecfd1342bd0aeed;hpb=aecbb49acfb4dfb3ee5abd0b96a46f38a4b2f568;p=aai%2Fmodel-loader.git diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh index 1dedb25..19d2717 100644 --- a/src/main/bin/start.sh +++ b/src/main/bin/start.sh @@ -20,13 +20,6 @@ # ============LICENSE_END============================================ #******************************************************************************* -# jre-alpine image has $JAVA_HOME set and added to $PATH -# ubuntu image requires to set $JAVA_HOME and add java to $PATH manually -if ( uname -v | grep -i "ubuntu" ); then - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-`dpkg --print-architecture | awk -F- '{ print $NF }'` - export PATH=${JAVA_HOME}:$PATH -fi - # AJSC_HOME is required for EELF logging. # This path is referenced in the file logback.xml. AJSC_HOME="${AJSC_HOME-/opt/app/model-loader}" @@ -37,6 +30,8 @@ if [ -z "$CONFIG_HOME" ]; then exit 1 fi +JARFILE=$(ls ./model-loader*.jar); + # Some properties are repeated here for debugging purposes. PROPS="-DAJSC_HOME=$AJSC_HOME" PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME" @@ -46,18 +41,5 @@ PROPS="$PROPS -Dlogback.configurationFile=$AJSC_HOME/logback.xml" PROPS="$PROPS -Dserver.port=9500" JVM_MAX_HEAP=${MAX_HEAP:-1024} -if [ -z "${java_runtime_arguments}" ]; then - java_runtime_arguments="-Xms75m -Xmx${JVM_MAX_HEAP}m \ - -Dcom.sun.management.jmxremote \ - -Dcom.sun.management.jmxremote.authenticate=false \ - -Dcom.sun.management.jmxremote.ssl=false \ - -Dcom.sun.management.jmxremote.local.only=false \ - -Dcom.sun.management.jmxremote.port=1099 \ - -Dcom.sun.management.jmxremote.rmi.port=1099 \ - -Djava.rmi.server.hostname=127.0.0.1" -fi - -JARFILE=$(ls ./model-loader*.jar); - echo "java $java_runtime_arguments $PROPS -jar $JARFILE" java $java_runtime_arguments $PROPS -jar $JARFILE