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

[Andras Timar (via logerrit)]

 docker/Dockerfile          |    3 +--
 docker/scripts/run-lool.sh |    3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e92f31ca86802a5f313daa96fba17075abb4a8ce
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Apr 24 13:29:01 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Apr 24 20:05:55 2020 +0200

    docker: generate the WOPI proof key at container startup
    
    Change-Id: Ic2d8dedcc7aff2a33ef5e26d986a1302fc6941fa
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92851
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 351f9589e..070826bf1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update
 # install LibreOffice run-time dependencies
 # install adduser, findutils, openssl and cpio that we need later
 # install an editor
-RUN apt-get -y install locales-all libpng16-16 fontconfig adduser cpio findutils nano libpocoxml50 libpocoutil50 libpoconetssl50 libpoconet50 libpocojson50 libpocofoundation50 libpococrypto50 libcap2-bin openssl inotify-tools procps libxcb-shm0 libxcb-render0 libxrender1 libxext6
+RUN apt-get -y install locales-all libpng16-16 fontconfig adduser cpio findutils nano libpocoxml50 libpocoutil50 libpoconetssl50 libpoconet50 libpocojson50 libpocofoundation50 libpococrypto50 libcap2-bin openssl openssh-client inotify-tools procps libxcb-shm0 libxcb-render0 libxrender1 libxext6
 
 # tdf#117557 - Add CJK Fonts to LibreOffice Online Docker Image
 RUN apt-get -y install fonts-wqy-zenhei fonts-wqy-microhei fonts-droid-fallback fonts-noto-cjk
@@ -31,7 +31,6 @@ RUN rm -rf /var/cache/loolwsd/*
 RUN rm -rf /opt/lool
 RUN mkdir -p /opt/lool/child-roots
 RUN loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice >/dev/null 2>&1
-RUN loolwsd-generate-proof-key >/dev/null 2>&1
 RUN touch /var/log/loolwsd.log
 # Fix permissions
 RUN chown lool:lool /var/log/loolwsd.log
diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index 1707dd124..b2128268f 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -41,5 +41,8 @@ perl -pi -e "s/<password (.*)>.*<\/password>/<password \1>${password}<\/password
 	pkill -f --signal 1 loolwsd
 ) &
 
+# Generate WOPI proof key
+loolwsd-generate-proof-key
+
 # Start loolwsd
 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}