summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-01-15 09:25:16 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-01-15 09:27:49 +0100
commit2880312af5632031155a047cb50561ebb62e9cf4 (patch)
tree3d157b5918389478f27bdb2c8d5d934e8f80b207 /docker
parentbuild requires m4 (diff)
downloadonline-2880312af5632031155a047cb50561ebb62e9cf4.tar.gz
online-2880312af5632031155a047cb50561ebb62e9cf4.zip
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
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c5948bb00a..7d59d55dbc 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