Skip to content

Commit

Permalink
Merge pull request #2 from cuipengfei/revert-1-main
Browse files Browse the repository at this point in the history
Revert "Update to libreoffice24 (jodconverter#4)"
  • Loading branch information
cuipengfei authored Aug 5, 2024
2 parents 6344e12 + 403dfe6 commit 07ff990
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down

0 comments on commit 07ff990

Please sign in to comment.