Fixed version parsing

[aai/model-loader.git] / src / main / bin / start.sh

diff --git a/src/main/bin/start.sh b/src/main/bin/start.sh
index 038f4df..1dedb25 100644 (file)
--- a/src/main/bin/start.sh
+++ b/src/main/bin/start.sh
@@ -20,6 +20,13 @@
 #  ============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}"
@@ -30,8 +37,6 @@ if [ -z "$CONFIG_HOME" ]; then
     exit 1
 fi
 
-JARFILE="$AJSC_HOME/model-loader.jar"
-
 # Some properties are repeated here for debugging purposes.
 PROPS="-DAJSC_HOME=$AJSC_HOME"
 PROPS="$PROPS -DCONFIG_HOME=$CONFIG_HOME"
@@ -52,5 +57,7 @@ if [ -z "${java_runtime_arguments}" ]; then
  -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