docker/Dockerfile | 2 +-
docker/scripts/run-lool.sh | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f92aa677c005c8d6d66898321db125566f0f47c4
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Dec 6 23:47:49 2018 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Jan 10 14:51:09 2019 +0100
docker: fix permission (owner) of /etc/loolwsd/key.pem
Change-Id: I9e0a9d8bc8c0fc0119e9c66389c1012023046c89
(cherry picked from commit 30b8170fab303b98c905db2bec7f6967c2e74c77)
Reviewed-on: https://gerrit.libreoffice.org/66109
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index a283672b4..f9ec69338 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -23,6 +23,7 @@ openssl genrsa -out "certs/servers/localhost/privkey.pem"
2048 -key "certs/serve
openssl req -key "certs/servers/localhost/privkey.pem" -new -sha256 -out
"certs/tmp/localhost.csr.pem" -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy
Authority/CN=localhost"
openssl x509 -req -in certs/tmp/localhost.csr.pem -CA certs/ca/root.crt.pem
-CAkey certs/ca/root.key.pem -CAcreateserial -out
certs/servers/localhost/cert.pem -days 9131
mv certs/servers/localhost/privkey.pem /etc/loolwsd/key.pem
+chown lool: /etc/loolwsd/key.pem
mv certs/servers/localhost/cert.pem /etc/loolwsd/cert.pem
mv certs/ca/root.crt.pem /etc/loolwsd/ca-chain.cert.pem
fi
commit 01e4af1b64a63076e43253e27a340e750eb83491
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Thu Dec 6 23:31:40 2018 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Thu Jan 10 14:50:58 2019 +0100
docker: install openssl
Change-Id: I35a223068f67d3a0740968996ec4af9c723873dc
(cherry picked from commit 70fe177a0fda5246e01fc12ce59a6e45cca6f303)
Reviewed-on: https://gerrit.libreoffice.org/66108
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bfc5934e2..2cebb82af 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get upgrade -y
# install apt-transport-https in order to set up repo for Poco
# install adduser, findutils and cpio that we need later
# install an editor
-RUN apt-get -y install apt-transport-https locales-all libpng16-16
libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1
libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50 libcap2-bin
+RUN apt-get -y install apt-transport-https locales-all libpng16-16
libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1
libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50 libcap2-bin
openssl
# 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
