From 9140613a96af0bdd92bd694f1c2f3739b5816d64 Mon Sep 17 00:00:00 2001
From: Marcel Waldvogel <marcel.waldvogel@trifence.ch>
Date: Mon, 5 Apr 2021 12:24:29 +0200
Subject: [PATCH] Services run as starting PID
The starting scripts now `exec` the main service instead of starting
it as a subprocess. Also in line with docker-entrypoint recommendations.
---
akka-bbb-apps/run-dev.sh | 3 +--
akka-bbb-apps/run.sh | 2 +-
akka-bbb-fsesl/run-dev.sh | 3 +--
akka-bbb-fsesl/run.sh | 2 +-
bbb-lti/docker-entrypoint.sh | 3 +--
bbb-lti/run.sh | 2 +-
bigbluebutton-html5/docker-entrypoint.sh | 2 +-
bigbluebutton-web/docker-entrypoint.sh | 2 +-
bigbluebutton-web/pres-checker/run.sh | 3 ++-
bigbluebutton-web/run-prod.sh | 3 +--
bigbluebutton-web/run.sh | 2 +-
11 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/akka-bbb-apps/run-dev.sh b/akka-bbb-apps/run-dev.sh
index d08b052304..2b3196bfa7 100755
--- a/akka-bbb-apps/run-dev.sh
+++ b/akka-bbb-apps/run-dev.sh
@@ -2,5 +2,4 @@
rm -rf src/main/resources
cp -R src/universal/conf src/main/resources
-sbt run
-
+exec sbt run
diff --git a/akka-bbb-apps/run.sh b/akka-bbb-apps/run.sh
index 3e24e4cf0a..f6bda6a01e 100755
--- a/akka-bbb-apps/run.sh
+++ b/akka-bbb-apps/run.sh
@@ -3,4 +3,4 @@
sbt clean stage
sudo service bbb-apps-akka stop
cd target/universal/stage
-./bin/bbb-apps-akka
+exec ./bin/bbb-apps-akka
diff --git a/akka-bbb-fsesl/run-dev.sh b/akka-bbb-fsesl/run-dev.sh
index d08b052304..2b3196bfa7 100755
--- a/akka-bbb-fsesl/run-dev.sh
+++ b/akka-bbb-fsesl/run-dev.sh
@@ -2,5 +2,4 @@
rm -rf src/main/resources
cp -R src/universal/conf src/main/resources
-sbt run
-
+exec sbt run
diff --git a/akka-bbb-fsesl/run.sh b/akka-bbb-fsesl/run.sh
index 39bdd4af2c..cf1032819e 100755
--- a/akka-bbb-fsesl/run.sh
+++ b/akka-bbb-fsesl/run.sh
@@ -3,4 +3,4 @@
sbt clean stage
sudo service bbb-fsesl-akka stop
cd target/universal/stage
-./bin/bbb-fsesl-akka
+exec ./bin/bbb-fsesl-akka
diff --git a/bbb-lti/docker-entrypoint.sh b/bbb-lti/docker-entrypoint.sh
index 83b353b124..481146e1be 100755
--- a/bbb-lti/docker-entrypoint.sh
+++ b/bbb-lti/docker-entrypoint.sh
@@ -9,5 +9,4 @@ if [ -f webapps/lti.war ]; then
rm webapps/lti.war
fi
-catalina.sh run
-
+exec catalina.sh run
diff --git a/bbb-lti/run.sh b/bbb-lti/run.sh
index 5ea15467f3..87bb9d9ab5 100644
--- a/bbb-lti/run.sh
+++ b/bbb-lti/run.sh
@@ -2,4 +2,4 @@
rm -rf libs
grails clean
grails compile
-grails prod run-app --port 8181
+exec grails prod run-app --port 8181
diff --git a/bigbluebutton-html5/docker-entrypoint.sh b/bigbluebutton-html5/docker-entrypoint.sh
index 951269c881..8a6494013f 100755
--- a/bigbluebutton-html5/docker-entrypoint.sh
+++ b/bigbluebutton-html5/docker-entrypoint.sh
@@ -2,4 +2,4 @@
export METEOR_SETTINGS=` jq "${METEOR_SETTINGS_MODIFIER}" ./programs/server/assets/app/config/settings-production.json `
-node main.js
+exec node main.js
diff --git a/bigbluebutton-web/docker-entrypoint.sh b/bigbluebutton-web/docker-entrypoint.sh
index df444043e9..ff6b757180 100755
--- a/bigbluebutton-web/docker-entrypoint.sh
+++ b/bigbluebutton-web/docker-entrypoint.sh
@@ -14,4 +14,4 @@ mkdir -p /var/bigbluebutton/unpublished
export JAVA_OPTS="${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -DsecuritySalt=${SHARED_SECRET} -Dredis.host=redis -DredisHost=redis -Dbigbluebutton.web.serverURL=https://${SERVER_DOMAIN} -DsvgImagesRequired=true"
sed -i "s|^securerandom\.source=.*|securerandom.source=file:/dev/urandom|g" ${JAVA_HOME}/lib/security/java.security
-catalina.sh run
+exec catalina.sh run
diff --git a/bigbluebutton-web/pres-checker/run.sh b/bigbluebutton-web/pres-checker/run.sh
index faa48086ab..0d176b6272 100755
--- a/bigbluebutton-web/pres-checker/run.sh
+++ b/bigbluebutton-web/pres-checker/run.sh
@@ -1 +1,2 @@
-java -cp "/usr/share/prescheck/lib/*" org.bigbluebutton.prescheck.Main $@
+#!/bin/sh
+exec java -cp "/usr/share/prescheck/lib/*" org.bigbluebutton.prescheck.Main $@
diff --git a/bigbluebutton-web/run-prod.sh b/bigbluebutton-web/run-prod.sh
index 0db15d92fb..5a2177779e 100755
--- a/bigbluebutton-web/run-prod.sh
+++ b/bigbluebutton-web/run-prod.sh
@@ -1,3 +1,2 @@
#!/bin/bash
-java -Dgrails.env=prod -Dserver.address=127.0.0.1 -Dserver.port=8090 -Xms384m -Xmx384m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.WarLauncher
-
+exec java -Dgrails.env=prod -Dserver.address=127.0.0.1 -Dserver.port=8090 -Xms384m -Xmx384m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.WarLauncher
diff --git a/bigbluebutton-web/run.sh b/bigbluebutton-web/run.sh
index 4772aea81f..f2f7a637d6 100755
--- a/bigbluebutton-web/run.sh
+++ b/bigbluebutton-web/run.sh
@@ -11,4 +11,4 @@ if [ "`whoami`" != "bigbluebutton" ]; then
exit 1
fi
-grails prod run-app --port 8090
+exec grails prod run-app --port 8090
--
GitLab