[Libreoffice-commits] online.git: docker/Dockerfile
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 21 08:40:25 UTC 2019
docker/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 72f0743f267be543a1d215dc6cd1f9721faedcde
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon Jan 21 09:39:27 2019 +0100
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Mon Jan 21 09:39:27 2019 +0100
Revert "Docker: Fix runtime dependencies for support key build"
This reverts commit 2880312af5632031155a047cb50561ebb62e9cf4.
Turned out it was a problem on the builder machine, not with the image itself.
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7d59d55db..c5948bb00 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.10
+FROM ubuntu:18.04
# 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*60 libcap2-bin openssl libssl1.0.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
More information about the Libreoffice-commits
mailing list