diff options
| author | Andras Timar <andras.timar@collabora.com> | 2020-03-05 15:42:49 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-03-05 21:11:30 +0100 |
| commit | 59993fb9d1bdc2d3b95091cd2af3801916f9d955 (patch) | |
| tree | 1a1596f9e6d3c1eb97f993bf2a1e9ebe5d2d14cf /docker | |
| parent | WebSocket - simplify handleMessage for now. (diff) | |
| download | online-59993fb9d1bdc2d3b95091cd2af3801916f9d955.tar.gz online-59993fb9d1bdc2d3b95091cd2af3801916f9d955.zip | |
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@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/scripts/run-lool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh index 7fca8a15d7..1707dd1248 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} |