Browse Source
Merge pull request #14791 from thingsboard/fix/edqs-docker
Fix CONF_FOLDER for start-tb-edqs.sh in k8s
pull/14805/head
Viacheslav Klimov
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
11 additions and
3 deletions
-
msa/edqs/docker/start-tb-edqs.sh
|
|
|
@ -15,11 +15,19 @@ |
|
|
|
# limitations under the License. |
|
|
|
# |
|
|
|
|
|
|
|
CONF_FOLDER=${pkg.installFolder}/conf |
|
|
|
jarfile=${pkg.installFolder}/bin/${pkg.name}.jar |
|
|
|
configfile=${pkg.name}.conf |
|
|
|
|
|
|
|
source "${CONF_FOLDER}/${configfile}" |
|
|
|
CONF_FOLDER="/config" |
|
|
|
if [ -d "${CONF_FOLDER}" ]; then |
|
|
|
LOGGING_CONFIG="${CONF_FOLDER}/logback.xml" |
|
|
|
source "${CONF_FOLDER}/${configfile}" |
|
|
|
export LOADER_PATH=${CONF_FOLDER},${LOADER_PATH} |
|
|
|
else |
|
|
|
CONF_FOLDER="/usr/share/${pkg.name}/conf" |
|
|
|
LOGGING_CONFIG="/usr/share/${pkg.name}/conf/logback.xml" |
|
|
|
source "${CONF_FOLDER}/${configfile}" |
|
|
|
fi |
|
|
|
|
|
|
|
echo "Starting '${project.name}' ..." |
|
|
|
|
|
|
|
@ -27,5 +35,5 @@ cd ${pkg.installFolder}/bin |
|
|
|
|
|
|
|
exec java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.edqs.ThingsboardEdqsApplication \ |
|
|
|
-Dspring.jpa.hibernate.ddl-auto=none \ |
|
|
|
-Dlogging.config=$CONF_FOLDER/logback.xml \ |
|
|
|
-Dlogging.config=${LOGGING_CONFIG} \ |
|
|
|
org.springframework.boot.loader.launch.PropertiesLauncher |
|
|
|
|
