From 403dfe697f303743b5b5f95baecfbbac84b3b71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B4=94=E9=B9=8F=E9=A3=9E=20Cui=20Pengfei?= Date: Mon, 5 Aug 2024 12:42:13 +0800 Subject: [PATCH] Revert "Update to libreoffice24 (#4)" --- Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e757c67..e3a372f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,15 +29,12 @@ ENV NONPRIVGROUP=jodconverter COPY --from=jresource /jre $JAVA_HOME -# using backports for libreoffice 24.x (bookworm has 7.x) -RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' > /etc/apt/sources.list.d/backports.list \ - && apt-get update && apt-get -y install \ +RUN apt-get update && 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 \ # procps needed for us finding the libreoffice process, see https://github.com/sbraconnier/jodconverter/issues/127#issuecomment-463668183 procps \ - # using backports for libreoffice 24.x (bookworm has 7.x) - && apt-get -y install -t bookworm-backports libreoffice libreoffice-base libreoffice-common libreoffice-base-core \ + && apt-get -y install libreoffice libreoffice-java-common --no-install-recommends \ && groupadd $NONPRIVGROUP \ && useradd -m $NONPRIVUSER -g $NONPRIVGROUP \ && rm -rf /var/lib/apt/lists/*