Skip to content
Snippets Groups Projects
Commit 9140613a authored by Marcel Waldvogel's avatar Marcel Waldvogel
Browse files

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.
parent 067f5e91
No related branches found
No related tags found
No related merge requests found
...@@ -2,5 +2,4 @@ ...@@ -2,5 +2,4 @@
rm -rf src/main/resources rm -rf src/main/resources
cp -R src/universal/conf src/main/resources cp -R src/universal/conf src/main/resources
sbt run exec sbt run
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
sbt clean stage sbt clean stage
sudo service bbb-apps-akka stop sudo service bbb-apps-akka stop
cd target/universal/stage cd target/universal/stage
./bin/bbb-apps-akka exec ./bin/bbb-apps-akka
...@@ -2,5 +2,4 @@ ...@@ -2,5 +2,4 @@
rm -rf src/main/resources rm -rf src/main/resources
cp -R src/universal/conf src/main/resources cp -R src/universal/conf src/main/resources
sbt run exec sbt run
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
sbt clean stage sbt clean stage
sudo service bbb-fsesl-akka stop sudo service bbb-fsesl-akka stop
cd target/universal/stage cd target/universal/stage
./bin/bbb-fsesl-akka exec ./bin/bbb-fsesl-akka
...@@ -9,5 +9,4 @@ if [ -f webapps/lti.war ]; then ...@@ -9,5 +9,4 @@ if [ -f webapps/lti.war ]; then
rm webapps/lti.war rm webapps/lti.war
fi fi
catalina.sh run exec catalina.sh run
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
rm -rf libs rm -rf libs
grails clean grails clean
grails compile grails compile
grails prod run-app --port 8181 exec grails prod run-app --port 8181
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
export METEOR_SETTINGS=` jq "${METEOR_SETTINGS_MODIFIER}" ./programs/server/assets/app/config/settings-production.json ` export METEOR_SETTINGS=` jq "${METEOR_SETTINGS_MODIFIER}" ./programs/server/assets/app/config/settings-production.json `
node main.js exec node main.js
...@@ -14,4 +14,4 @@ mkdir -p /var/bigbluebutton/unpublished ...@@ -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" 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 sed -i "s|^securerandom\.source=.*|securerandom.source=file:/dev/urandom|g" ${JAVA_HOME}/lib/security/java.security
catalina.sh run exec catalina.sh run
java -cp "/usr/share/prescheck/lib/*" org.bigbluebutton.prescheck.Main $@ #!/bin/sh
exec java -cp "/usr/share/prescheck/lib/*" org.bigbluebutton.prescheck.Main $@
#!/bin/bash #!/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
...@@ -11,4 +11,4 @@ if [ "`whoami`" != "bigbluebutton" ]; then ...@@ -11,4 +11,4 @@ if [ "`whoami`" != "bigbluebutton" ]; then
exit 1 exit 1
fi fi
grails prod run-app --port 8090 exec grails prod run-app --port 8090
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment