From 314107f3a3a54921a448672d8066dea470ea60cc Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Mon, 19 Apr 2021 22:23:09 +0000
Subject: [PATCH] entrypoint.sh simplified.
---
borgbutler-docker/app/entrypoint.sh | 6 ++++--
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/borgbutler-docker/app/entrypoint.sh b/borgbutler-docker/app/entrypoint.sh
index 7111d2f..80dda1c 100644
--- a/borgbutler-docker/app/entrypoint.sh
+++ b/borgbutler-docker/app/entrypoint.sh
@@ -61,9 +61,11 @@
#Trap SIGTERM
trap cleanup INT SIGTERM
-echo "Starting java ${JAVA_OPTS} -cp app/web/*:app/lib/* -DBorgButlerHome=/BorgButler/ -Dserver.address=0.0.0.0 -Ddocker=true ${JAVA_MAIN} ${JAVA_ARGS}"
+START="${JAVA_OPTS} -cp app/web/*:app/lib/* -DBorgButlerHome=/BorgButler/ -Dserver.address=0.0.0.0 -Ddocker=true ${JAVA_MAIN} ${JAVA_ARGS}"
-java $JAVA_OPTS -cp app/web/*:app/lib/* -DBorgButlerHome=/BorgButler/ -Dserver.address=0.0.0.0 -Ddocker=true $JAVA_MAIN $JAVA_ARGS &
+echo "Starting: java ${START}"
+
+java $START &
CHILD=$!
wait $CHILD
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt
index 6666717..0e99edd 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/BorgButlerApplication.kt
@@ -210,10 +210,11 @@
private const val ENVIRONMENT_FILE = "environment.sh"
private const val ENVIRONMENT_FILE_INITIAL_CONTENT = "#!/bin/bash\n\n" +
- "# Set the java options here (for docker installation only):\n" +
+ "# Set the java options and arguments here for Your docker installation only.\n\n" +
+ "# Increase ProjectForge's memory setting:\n" +
"#export JAVA_OPTS=-DXmx4g\n" +
"export JAVA_OPTS=\n\n" +
- "# Set your options here (will be used for starting\n" +
+ "# Define your optional program arguments here\n" +
"export JAVA_ARGS=\n"
}
}
--
Gitblit v1.10.0