diff options
| author | Andras Timar <andras.timar@collabora.com> | 2018-12-08 16:08:03 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-12-08 16:08:03 +0100 |
| commit | 8092c3eabd35b20f9309257360a7353a3a6ac9f1 (patch) | |
| tree | 4d9dac354ca940fea217b05aeda5c8905263fc18 /docker | |
| parent | ui: Unfortunately we have to start with the 'styles' visible even in calc. (diff) | |
| download | online-8092c3eabd35b20f9309257360a7353a3a6ac9f1.tar.gz online-8092c3eabd35b20f9309257360a7353a3a6ac9f1.zip | |
docker: do not install system libpixman, fix RPATH of libcairo
Change-Id: I28c6ee71bca80d1dd65daa02af5d719a94d55034
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | docker/l10n-docker-nightly.sh | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 37f46b78bc..c5948bb00a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,9 +10,9 @@ FROM ubuntu:18.04 RUN apt-get update && apt-get upgrade -y # install LibreOffice run-time dependencies -# install adduser, findutils and cpio that we need later +# install adduser, findutils, openssl and cpio that we need later # install an editor -RUN apt-get -y install 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 +RUN apt-get -y install 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 diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh index 9e91f98f76..59ce780d37 100755 --- a/docker/l10n-docker-nightly.sh +++ b/docker/l10n-docker-nightly.sh @@ -114,6 +114,9 @@ EOF mkdir -p "$INSTDIR"/opt/ cp -a libreoffice/instdir "$INSTDIR"/opt/libreoffice +# FIXME fix RPATH of libcairo +chrpath -r '$ORIGIN' "$INSTDIR"/opt/libreoffice/program/libcairo.so.2 + ##### loolwsd & loleaflet ##### # build |