[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - 3 commits - docker/Dockerfile docker/l10n-docker-nightly.sh

[Libreoffice Gerrit user]

 docker/Dockerfile             |    5 ++---
 docker/l10n-docker-nightly.sh |    3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1bc20e7c793e8eb753d6539cbffd8b8e01c02894
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sat Dec 8 16:08:03 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Jan 10 14:51:46 2019 +0100

    docker: do not install system libpixman, fix RPATH of libcairo
    
    Change-Id: I28c6ee71bca80d1dd65daa02af5d719a94d55034
    (cherry picked from commit 8092c3eabd35b20f9309257360a7353a3a6ac9f1)
    Reviewed-on: https://gerrit.libreoffice.org/66112
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 37f46b78b..c5948bb00 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 9e91f98f7..59ce780d3 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
commit d02cd150326fc0b7febf22a2387bd33acfc2050f
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri Dec 7 10:12:08 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Jan 10 14:51:40 2019 +0100

    docker: apt-transport-https no longer needed
    
    since we don't have any custom repos anymore
    
    Change-Id: Ib6fc8989ed4085b862e3bda5c7136f2022b6d345
    (cherry picked from commit 0a246d856350d52e07c689cb58ee204654ae67a9)
    Reviewed-on: https://gerrit.libreoffice.org/66111
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index b775d114b..37f46b78b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -10,10 +10,9 @@ FROM ubuntu:18.04
 RUN apt-get update && apt-get upgrade -y
 
 # install LibreOffice run-time dependencies
-# 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 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 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
commit dd312860e8b05e96ab38ffea1a29e73794b5df20
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri Dec 7 09:54:02 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Jan 10 14:51:32 2019 +0100

    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 at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2cebb82af..b775d114b 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