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

[Libreoffice Gerrit user]

 docker/Dockerfile |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit fd3c08bcc38e3982af381ee0db1b61ed80328f2a
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Dec 6 23:21:38 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Jan 10 14:50:51 2019 +0100

    docker: install libcap2-bin
    
    Change-Id: Ibd6f794190ec2f6f511f6b8546bbcd237a971a43
    (cherry picked from commit bea079cfce4b98dc343419be5e2f8f22d5efb679)
    Reviewed-on: https://gerrit.libreoffice.org/66107
    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 8589bf9c6..bfc5934e2 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
+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
 
 # 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 162e09ebc25981ba3b70d138264e0665d6ccb259
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Dec 6 22:47:15 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Jan 10 14:50:43 2019 +0100

    docker: fix libpng dependency
    
    Change-Id: I1ab093460c4cac1fbcb8f37ad54e742d5560206c
    (cherry picked from commit 433c0b43b115d0dc473a9d05c7984f77ffb18f7a)
    Reviewed-on: https://gerrit.libreoffice.org/66106
    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 0df3c0d44..8589bf9c6 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 libpng12-0 libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50
+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
 
 # 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 bffd5fddc5015b0a93e23311f55f061738067013
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Dec 6 12:29:23 2018 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Jan 10 14:50:37 2019 +0100

    docker: we are based on Ubuntu 18.04 now
    
    Change-Id: Ie81ec22081a1d7c71f4f1424a7b61c29b74b46d4
    (cherry picked from commit b26db00c420d18d4a6c997e2144d6d3fd3af17f3)
    Reviewed-on: https://gerrit.libreoffice.org/66105
    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 c4c1423e0..0df3c0d44 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 # get the latest fixes
 RUN apt-get update && apt-get upgrade -y
@@ -13,13 +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 libpng12-0 libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 libxcb-render0 adduser cpio findutils nano
-
-# set up 3rd party repo of Poco, dependency of loolwsd
-RUN echo "deb https://collaboraoffice.com/repos/Poco/ /" >> /etc/apt/sources.list.d/poco.list
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0C54D189F4BA284D
-RUN apt-get update
-RUN apt-get -y install libpoco*60
+RUN apt-get -y install apt-transport-https locales-all libpng12-0 libxinerama1 libgl1-mesa-glx libfontconfig1 libfreetype6 libxrender1 libxcb-shm0 libxcb-render0 adduser cpio findutils nano libpoco*50
 
 # 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