[Libreoffice-commits] online.git: docker/scripts

[Libreoffice Gerrit user]

 docker/scripts/run-lool.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c1639750d94db05f9ff3dfd8856f5a8f7c20bc3
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Nov 12 21:22:51 2018 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Nov 12 21:22:51 2018 +0100

    pass extra loolwsd command line parameter via environment variable
    
    docker run .... -e "extra_params=....." .....
    
    For example it makes sense to start loolwsd without SSL, when you test
    or develop. In this case the syntax is: -e "extra_params=--o:ssl.enable=false"
    
    Change-Id: Iaa9eafc1e1d3f2d24009321760d1b7d6a9998450

diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index c85983b2b..71f14396a 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -34,4 +34,4 @@ perl -pi -e "s/<username (.*)>.*<\/username>/<username \1>${username}<\/username
 perl -pi -e "s/<password (.*)>.*<\/password>/<password \1>${password}<\/password>/" /etc/loolwsd/loolwsd.xml
 
 # Start loolwsd
-su -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/libreoffice --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd" -s /bin/bash lool
+su -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/libreoffice --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd ${extra_params}" -s /bin/bash lool