diff --git a/pom.xml b/pom.xml index bffba1da8..4abe5b76c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ net.sumaris sumaris-pod - 2.8.11 + 2.8.12-SNAPSHOT pom SUMARiS SUMARiS :: Maven parent diff --git a/sumaris-core-shared/pom.xml b/sumaris-core-shared/pom.xml index 7aefdfa9c..d68306be5 100644 --- a/sumaris-core-shared/pom.xml +++ b/sumaris-core-shared/pom.xml @@ -4,7 +4,7 @@ net.sumaris sumaris-pod - 2.8.11 + 2.8.12-SNAPSHOT sumaris-core-shared diff --git a/sumaris-core/pom.xml b/sumaris-core/pom.xml index 7dff2f8a7..f4d5710e6 100644 --- a/sumaris-core/pom.xml +++ b/sumaris-core/pom.xml @@ -4,7 +4,7 @@ net.sumaris sumaris-pod - 2.8.11 + 2.8.12-SNAPSHOT sumaris-core diff --git a/sumaris-extraction/pom.xml b/sumaris-extraction/pom.xml index 125caa78c..15968602f 100644 --- a/sumaris-extraction/pom.xml +++ b/sumaris-extraction/pom.xml @@ -5,7 +5,7 @@ net.sumaris sumaris-pod - 2.8.11 + 2.8.12-SNAPSHOT sumaris-extraction diff --git a/sumaris-importation/pom.xml b/sumaris-importation/pom.xml index 31db58749..13b67fc6f 100644 --- a/sumaris-importation/pom.xml +++ b/sumaris-importation/pom.xml @@ -3,7 +3,7 @@ sumaris-pod net.sumaris - 2.8.11 + 2.8.12-SNAPSHOT 4.0.0 diff --git a/sumaris-rdf/pom.xml b/sumaris-rdf/pom.xml index 97406626d..b7c4782c0 100644 --- a/sumaris-rdf/pom.xml +++ b/sumaris-rdf/pom.xml @@ -3,7 +3,7 @@ sumaris-pod net.sumaris - 2.8.11 + 2.8.12-SNAPSHOT 4.0.0 diff --git a/sumaris-server/pom.xml b/sumaris-server/pom.xml index 988470de9..42fea5500 100644 --- a/sumaris-server/pom.xml +++ b/sumaris-server/pom.xml @@ -4,7 +4,7 @@ net.sumaris sumaris-pod - 2.8.11 + 2.8.12-SNAPSHOT sumaris-server diff --git a/sumaris-server/src/main/docker/run/app.sh b/sumaris-server/src/main/docker/run/app.sh new file mode 100644 index 000000000..ca685ef45 --- /dev/null +++ b/sumaris-server/src/main/docker/run/app.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +# +# %L +# SUMARiS +# %% +# Copyright (C) 2019 SUMARiS Consortium +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# . +# L% +# + +APP_NAME=sumaris +BASEDIR=/app +LOG_DIR=/app/logs +TNS_ADMIN=/home/tnsnames +JAVA_OPTS="${JAVA_OPTS} --enable-preview" # Fix Java 17 error +JAVA_OPTS="${JAVA_OPTS} -D${APP_NAME}.basedir=${BASEDIR}" +JAVA_OPTS="${JAVA_OPTS} -Dspring.config.location=file:${BASEDIR}/config/" +JAVA_OPTS="${JAVA_OPTS} -Dsumaris.log.file=${LOG_DIR}/${APP_NAME}-pod.log" +JAVA_OPTS="${JAVA_OPTS} -Doracle.net.tns_admin=${TNS_ADMIN}" +JAVA_OPTS="${JAVA_OPTS} -Doracle.jdbc.timezoneAsRegion=false" +[[ "_${PROFILES}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Dspring.profiles.active=${PROFILES}" +[[ "_${TZ}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Duser.timezone=${TZ}" +[[ "_${PORT}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Dserver.port=${PORT}" +[[ "_${XMS}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Xms${XMS}" +[[ "_${XMX}" != "_" ]] && JAVA_OPTS="${JAVA_OPTS} -Xmx${XMX}" + +ARGS= +# TODO test this +#ARGS=${@:2} + +echo "*** Starting ${APP_NAME}-pod - args: ${ARGS} - profiles: ${PROFILES} ***" + +java ${JAVA_OPTS} -server -jar ${BASEDIR}/app.war ${ARGS} \ No newline at end of file diff --git a/sumaris-server/src/main/docker/run/start-pod.sh b/sumaris-server/src/main/docker/run/docker-run.sh similarity index 100% rename from sumaris-server/src/main/docker/run/start-pod.sh rename to sumaris-server/src/main/docker/run/docker-run.sh diff --git a/sumaris-test-shared/pom.xml b/sumaris-test-shared/pom.xml index 6f3989033..70cbb4ef2 100644 --- a/sumaris-test-shared/pom.xml +++ b/sumaris-test-shared/pom.xml @@ -4,7 +4,7 @@ net.sumaris sumaris-pod - 2.8.11 + 2.8.12-SNAPSHOT sumaris-test-shared diff --git a/sumaris-xml-query/pom.xml b/sumaris-xml-query/pom.xml index 87dbbd8fc..f010f741e 100644 --- a/sumaris-xml-query/pom.xml +++ b/sumaris-xml-query/pom.xml @@ -5,7 +5,7 @@ net.sumaris sumaris-pod - 2.8.11 + 2.8.12-SNAPSHOT sumaris-xml-query