Skip to content

put apt calls together to streamline the dockerfile #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2025
Merged

put apt calls together to streamline the dockerfile #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 29 additions & 33 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,30 +90,23 @@ FROM ${RUNBASE} AS run

ARG TARGETPLATFORM

# Copy Typst
COPY --from=build-typst /usr/local/cargo/bin/typst /usr/local/bin

# These binaries are the second most costly part of the build.
COPY --from=build-texlive /texlivebins /usr/local/texlive

# Copy only the fonts we're using from the template.
COPY --from=build-fonts \
/usr/share/fonts/truetype/msttcorefonts/Arial* \
/usr/share/fonts/truetype/msttcorefonts/Courier* \
/usr/share/fonts/TTF/ARIAL* \
/usr/share/fonts/OTF/Libertinus* \
/usr/share/fonts/truetype/noto/NotoSansMono* \
/usr/share/fonts/

RUN apt update && apt install -y fontconfig && \
fc-cache -f

RUN apt install -y \
RUN apt update && apt install -y \
aasvg \
xorg \
xvfb \
dbus \
bash \
default-jre \
fontconfig \
imagemagick \
libnss3 \
librsvg2-bin \
libsecret-1-0 \
libxss1 \
moreutils \
nodejs \
npm \
openbox \
rsync \
sed \
software-properties-common \
Expand All @@ -137,6 +130,10 @@ RUN wget -O /usr/share/plantuml.jar https://github.com/plantuml/plantuml/release
# built above, not any that happen to have come along with our base image.
ENV PATH="/usr/local/texlive/bin/aarch64-linux:/usr/local/texlive/bin/x86_64-linux:${PATH}"

# Copy TeX Live and latexdiff
COPY --from=build-texlive /texlivebins /usr/local/texlive
COPY --from=build-latexdiff /usr/local/bin/latexdiff* /usr/local/bin

# Packages that are needed despite not being used explicitly by the template:
# bigfoot, catchfile, fancyvrb, footmisc, framed, hardwrap, lineno, ltablex, latexmk, needspace, pgf, zref
# Package dependencies introduced by latexdiff:
Expand Down Expand Up @@ -211,18 +208,6 @@ RUN tlmgr update --self && tlmgr install \
xltabular \
zref

RUN apt install -y \
aasvg \
dbus \
imagemagick \
libnss3 \
librsvg2-bin \
libsecret-1-0 \
libxss1 \
openbox \
xorg \
xvfb

ENV DRAWIO_RELEASE=26.0.16

# TARGETPLATFORM is linux/arm64 or linux/amd64. The release for amd64 is called drawio-amd64-23.1.5.deb.
Expand All @@ -231,8 +216,19 @@ RUN export DRAWIO_DEB=drawio-${TARGETPLATFORM#linux/}-${DRAWIO_RELEASE}.deb && \
dpkg -i ${DRAWIO_DEB} && \
rm ${DRAWIO_DEB}

# Grab latexdiff
COPY --from=build-latexdiff /usr/local/bin/latexdiff* /usr/local/bin
# Copy Typst
COPY --from=build-typst /usr/local/cargo/bin/typst /usr/local/bin

# Copy only the fonts we're using from the template.
COPY --from=build-fonts \
/usr/share/fonts/truetype/msttcorefonts/Arial* \
/usr/share/fonts/truetype/msttcorefonts/Courier* \
/usr/share/fonts/TTF/ARIAL* \
/usr/share/fonts/OTF/Libertinus* \
/usr/share/fonts/truetype/noto/NotoSansMono* \
/usr/share/fonts/
# Refresh the font cache.
RUN fc-cache -f

# https://stackoverflow.com/questions/52998331/imagemagick-security-policy-pdf-blocking-conversion
RUN sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml
Expand Down