summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2018-12-07 09:54:02 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-01-10 14:51:32 +0100
commitdd312860e8b05e96ab38ffea1a29e73794b5df20 (patch)
tree64fbabc2308f9ecc7ea414100e04c1ff8541678e
parentdocker: fix permission (owner) of /etc/loolwsd/key.pem (diff)
downloadonline-dd312860e8b05e96ab38ffea1a29e73794b5df20.tar.gz
online-dd312860e8b05e96ab38ffea1a29e73794b5df20.zip
Docker: Install libpixman
This lib was not found after upgrade to Ubuntu 18.04 Change-Id: I37853f115907ae2e795371ec46eee305f91aeed7 (cherry picked from commit 9139bd33303853bea680761f84bab7792f056438) Reviewed-on: https://gerrit.libreoffice.org/66110 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
-rw-r--r--docker/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2cebb82afc..b775d114bc 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 openssl
+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 libpixman-1-0
# 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