From 0effeadc17d313da2e1f3c62eda33b748070bc57 Mon Sep 17 00:00:00 2001 From: Leopold Fajtak Date: Mon, 21 Oct 2024 21:53:58 +0200 Subject: [PATCH] changed docker to Debian --- Dockerfile | 23 ++++++++++++++++++++--- Makefile | 15 ++++++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3b5e662..03beea8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,22 @@ -FROM archlinux:latest +FROM debian:sid-slim -RUN pacman -Syu --noconfirm texlive texlive-langgerman lilypond pdftk perl-template-toolkit make inkscape -WORKDIR /tmp +ENV LANG=C.UTF-8 \ + LC_ALL=C.UTF-8 \ + # ConTeXt cache can be created on runtime and does not need to + # increase image size + TEXLIVE_INSTALL_NO_CONTEXT_CACHE=1 \ + # As we will not install regular documentation why would we want to + # install perl docs… + NOPERLDOC=1 + + +RUN apt-get -q update && \ + apt-get -qy upgrade && \ + apt-get install -qy --no-install-recommends git make lilypond texlive-extra-utils texlive-font-utils texlive-latex-base texlive-latex-extra texlive-luatex texlive-lang-german texlive-music libtemplate-perl pdftk-java inkscape fonts-ebgaramond fonts-dosis && \ + rm -rf /var/lib/apt/lists/* + +ENV HOME /data +WORKDIR /data + +VOLUME ["/data"] diff --git a/Makefile b/Makefile index f7be30a..4e7734f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ .PHONY: all tex_deps = build variables.tt library/*/*/*.tt song_choices.csv song_template.tt propers/*.tt purpose_processing.tt -tpage = /usr/bin/vendor_perl/tpage docker = podman all: leadsheet_collection.pdf print_a3.pdf print_a4.pdf clean_intermediate %.pdf: %.tex @@ -28,13 +27,13 @@ songsheet_a5.pdf: songsheet.pdf cd build && \ pdfjam -o $@ --nup 2x1 --paper a5paper --landscape $< songsheet.tex: songsheet.tt $(tex_deps) header.tt head.tt footer.tt - $(tpage) $< > build/$@ + tpage $< > build/$@ musician_scores.tex: musician_scores.tt $(tex_deps) - $(tpage) $< > build/$@ + tpage $< > build/$@ leadsheet_collection.tex: musician_scores.tt $(tex_deps) - $(tpage) --define parts=band $< > build/$@ + tpage --define parts=band $< > build/$@ chornoten.tex: musician_scores.tt $(tex_deps) - $(tpage) --define parts=choir $< > build/$@ + tpage --define parts=choir $< > build/$@ clean_intermediate: cd build && \ rm songsheet_a3part.pdf songsheet_a4part.pdf songsheet_a5.pdf @@ -44,8 +43,10 @@ clean: rm -r build init: git submodule update --init --recursive -init_docker: +build_docker_image: $(docker) build -t songsheet_generator . +pull_docker: + $(docker) pull gitea.leopold.fajtak.at/leopold/songsheet_generator:latest build_in_docker: - $(docker) run -v `pwd`:/tmp songsheet_generator make + $(docker) run -v `pwd`:/data songsheet_generator make