[Libreoffice-commits] online.git: docker/Dockerfile

[Libreoffice Gerrit user]

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

New commits:
commit 2880312af5632031155a047cb50561ebb62e9cf4
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Tue Jan 15 09:25:16 2019 +0100
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Tue Jan 15 09:27:49 2019 +0100

    Docker: Fix runtime dependencies for support key build
    
    * Install libssl
    * libPocoNet.so is needed. Only available starting from Ubuntu 18.10,
      so upgrade the docker base image accordingly
    
    Change-Id: I7c60c92d9c1126d36742d3b48992029e55aad405

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c5948bb00..7d59d55db 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:18.04
+FROM ubuntu:18.10
 
 # get the latest fixes
 RUN apt-get update && apt-get upgrade -y
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get upgrade -y
 # install LibreOffice run-time dependencies
 # 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
+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*60 libcap2-bin openssl libssl1.0.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