From f99abdeb419f4f74766b545e6100a827918c5fa9 Mon Sep 17 00:00:00 2001 From: Willy Hille Date: Mon, 6 Jan 2025 14:11:55 +0000 Subject: [PATCH] update to ubuntu 24.04 --- Dockerfile | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e04696..7e59d8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.10 +FROM ubuntu:24.04 WORKDIR /tmp RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive \ @@ -9,7 +9,7 @@ RUN apt-get update && \ build-essential \ ca-certificates \ git \ - libwxgtk3.0-gtk3-dev \ + libwxgtk3.2-dev \ libpoppler-glib-dev \ poppler-utils RUN git clone https://github.com/vslavik/diff-pdf.git @@ -18,7 +18,7 @@ RUN ./bootstrap RUN ./configure RUN make -j4 -FROM ubuntu:22.10 +FROM ubuntu:24.04 COPY --from=0 /tmp/diff-pdf/diff-pdf /bin/diff-pdf RUN apt-get update &&\ @@ -28,10 +28,10 @@ RUN apt-get update &&\ apt-utils \ biber \ inkscape \ - libwxgtk3.0-gtk3-dev \ + libwxgtk3.2-dev \ python-is-python3 \ - python3.10 \ - python3-pip \ + python3.12 \ + python3-pygments \ texlive-bibtex-extra \ texlive-extra-utils \ texlive-fonts-recommended \ @@ -40,12 +40,6 @@ RUN apt-get update &&\ texlive-plain-generic \ tzdata \ xvfb \ -&& \ - pip3 install \ - Pygments \ -&& \ - apt-get purge -y --auto-remove \ - python3-pip \ && \ rm -rf /var/lib/apt/lists/* @@ -54,7 +48,7 @@ RUN apt-get update &&\ # https://github.com/alexpovel/latex-extras-docker/blob/5429a82ef415c2e9eda0c20f71e7df63b51621e9/Dockerfile#L80-L87 # install custom pygments lexers -WORKDIR /usr/local/lib/python3.10/dist-packages/pygments/lexers +WORKDIR /usr/lib/python3/dist-packages/pygments/lexers/ COPY pygments-lexers/* . RUN python3 _mapping.py @@ -63,16 +57,16 @@ ADD https://raw.githubusercontent.com/aclements/latexrun/master/latexrun /latexr RUN chmod 644 /latexrun.py # settings (used in compile.sh) -ENV BIND_PATH /latex -ENV BUILD_DIRECTORY .build +ENV BIND_PATH=/latex +ENV BUILD_DIRECTORY=.build ENV CLEAN_BUILD= ENV DELETE_TEMP= ENV DISABLE_DIFFPDF= ENV DISABLE_PYTHONTEX= ENV DISABLE_SYNCTEX= ENV HOST_PATH= -ENV TARGET main -ENV WARNINGS -Wall +ENV TARGET=main +ENV WARNINGS=-Wall WORKDIR $BIND_PATH COPY compile.sh /