From 6b825d3b80fa8426e4adcc483bd2a6b341f15967 Mon Sep 17 00:00:00 2001 From: Hendrik Kleinwaechter Date: Wed, 22 Nov 2023 21:41:07 -0900 Subject: [PATCH] Use trixie as base image --- Dockerfile | 10 ++++++++-- makefile | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8fab7998..8c408563 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.com/islandoftex/images/texlive +FROM debian:trixie LABEL "maintainer"="Hendrik Kleinwächter " LABEL "repository"="https://github.com/hendricius/the-sourdough-framework" @@ -6,7 +6,7 @@ LABEL "homepage"="https://github.com/hendricius/the-sourdough-framework" LABEL org.opencontainers.image.source="https://github.com/hendricius/the-sourdough-framework" # Print release information if needed -# RUN cat /etc/*release* +RUN cat /etc/*release* # Install base depdendencies RUN apt-get update && \ @@ -24,6 +24,12 @@ RUN apt-get update && \ imagemagick \ build-essential +# Install TeX +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + texlive-full \ + texlive-luatex + WORKDIR /root # Install ruby for the website build process diff --git a/makefile b/makefile index 2756c5b0..1dd8daf9 100644 --- a/makefile +++ b/makefile @@ -13,14 +13,14 @@ build_docker_image: push_docker_image: build_docker_image docker push $(DOCKER_IMAGE):latest -# Books/website +# Books/website # Quicker run for each commit, shall catch most problems validate: $(DOCKER_CMD) "cd /opt/repo/book && make -j build_serif_pdf build_ebook" build_pdf: - $(DOCKER_CMD) "cd /opt/repo/book && make" + $(DOCKER_CMD) "cd /opt/repo/book && make" bake: $(DOCKER_CMD) "cd /opt/repo/book && make -j bake"