[Libreoffice-commits] online.git: docker/scripts
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Thu Mar 5 20:11:50 UTC 2020
docker/scripts/run-lool.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 59993fb9d1bdc2d3b95091cd2af3801916f9d955
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Mar 5 15:42:49 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Mar 5 21:11:30 2020 +0100
docker: don't start another shell, let the loolwsd process have the PID 1
(Suggested by Ralf Becker)
https://github.com/CollaboraOnline/Docker/commit/e024a6c2a34958cbb6e2208652902070b35a9e62#r37648923
Change-Id: Ifa519739686facb41eb9e85b68ebe547e008db34
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90019
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index 7fca8a15d..1707dd124 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -42,4 +42,4 @@ perl -pi -e "s/<password (.*)>.*<\/password>/<password \1>${password}<\/password
) &
# Start loolwsd
-/bin/bash -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd ${extra_params}"
+exec /usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd ${extra_params}
More information about the Libreoffice-commits
mailing list