Revert "Docker: Fix runtime dependencies for support key build"

This reverts commit 2880312af5.

Turned out it was a problem on the builder machine, not with the image itself.
This commit is contained in:
Samuel Mehrbrodt 2019-01-21 09:39:27 +01:00
parent bb2257c2ee
commit 72f0743f26

View file

@ -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