Enable push and adjust packages

innofactororg · Mar 21, 2024 · 8559bdc · 8559bdc
1 parent 46256aa
commit 8559bdc
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 61 deletions.
diff --git a/.github/workflows/build-manual.yaml b/.github/workflows/build-manual.yaml
@@ -71,16 +71,11 @@ jobs:
         run: make test-extra
 
       - name: Push
-        if: >-
-          (github.event_name == 'push' || github.event_name == 'schedule') &&
-          github.repository == 'innofactororg/pandoc-dockerfiles'
+        if: github.repository == 'innofactororg/pandoc-dockerfiles'
         run: |
           # Log into registry
           echo "${{ secrets.DOCKER_HUB_TOKEN }}" |
             docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
-          #make push-minimal
           if [ "$STACK" != 'static' ]; then
-              #make push-core
-              #make push-latex
               make push-extra
           fi
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -177,6 +177,13 @@ WORKDIR /data
 # extra ##############################################################
 FROM alpine-latex as alpine-extra
 
+# NOTE: to maintainers, please keep this listing alphabetical.
+RUN apk --no-cache add \
+        bash \
+        font-carlito \
+        git \
+        jq
+
 COPY common/latex/texlive.profile /root/texlive.profile
 COPY common/extra/packages.txt /root/extra_packages.txt
 COPY common/extra/requirements.txt /root/extra_requirements.txt

diff --git a/common/extra/packages.txt b/common/extra/packages.txt
@@ -16,7 +16,7 @@ trimspaces
 abstract
 adjustbox
 awesomebox
-babel-german
+#babel-german
 background
 bidi
 catchfile
@@ -60,11 +60,13 @@ sourceserifpro
 
 #########################################################################
 # Required by Beamer/Metropolis
-beamertheme-metropolis
-pgfopts
-tcolorbox
-environ
-tikzfill
+#beamertheme-metropolis
+#pgfopts
+#tcolorbox
+#environ
+#tikzfill
 
 # https://github.com/pandoc/dockerfiles/issues/135
 enumitem
+
+lastpage
diff --git a/common/latex/packages.txt b/common/latex/packages.txt
@@ -6,17 +6,17 @@
 #       longtable -> tools
 
 # Redundant, as included in `scheme-basic`
-amsfonts
-amsmath
-geometry
-graphics
-hyperref
-iftex
-lm
-luatex
-oberdiek
-pdftexcmds
-tools       # The LaTeX standard tools bundle; e.g., calc, longtable
+#amsfonts
+#amsmath
+#geometry
+#graphics
+#hyperref
+#iftex
+#lm
+#luatex
+#oberdiek
+#pdftexcmds
+#tools       # The LaTeX standard tools bundle; e.g., calc, longtable
 
 # Other basic packages
 beamer
@@ -46,7 +46,7 @@ subfig      # Figures broken into subfigures
 
 # Needed for when `--highlight-style` is used with something other than
 # pygments.
-framed
+#framed
 
 #########################################################################
 # Extra packages for XeTex, LuaTex, and BibLaTex.                     
@@ -68,38 +68,38 @@ xetex
 # those were the ones installed by texlive by default for a long time.
 bidi
 csquotes
-babel-basque
-babel-czech
-babel-danish
-babel-dutch
+#babel-basque
+#babel-czech
+#babel-danish
+#babel-dutch
 babel-english
-babel-finnish
-babel-french
-babel-german
-babel-hungarian
-babel-italian
-babel-norsk
-babel-polish
-babel-portuges
-babel-spanish
-babel-swedish
-hyphen-basque
-hyphen-czech
-hyphen-danish
-hyphen-dutch
+#babel-finnish
+#babel-french
+#babel-german
+#babel-hungarian
+#babel-italian
+#babel-norsk
+#babel-polish
+#babel-portuges
+#babel-spanish
+#babel-swedish
+#hyphen-basque
+#hyphen-czech
+#hyphen-danish
+#hyphen-dutch
 hyphen-english
-hyphen-finnish
-hyphen-french
-hyphen-german
-hyphen-hungarian
-hyphen-italian
-hyphen-norwegian
-hyphen-polish
-hyphen-portuguese
-hyphen-spanish
-hyphen-swedish
+#hyphen-finnish
+#hyphen-french
+#hyphen-german
+#hyphen-hungarian
+#hyphen-italian
+#hyphen-norwegian
+#hyphen-polish
+#hyphen-portuguese
+#hyphen-spanish
+#hyphen-swedish
 # no longer needed in newer pandoc versions
-polyglossia
+#polyglossia
 
 #########################################################################
 # Reference backend options

diff --git a/common/latex/texlive.profile b/common/latex/texlive.profile
@@ -17,7 +17,7 @@ instopt_adjustrepo 1
 instopt_letter 0
 instopt_portable 0
 instopt_write18_restricted 1
-tlpdbopt_autobackup 1
+tlpdbopt_autobackup 0
 tlpdbopt_backupdir tlpkg/backups
 tlpdbopt_create_formats 1
 tlpdbopt_desktop_integration 1

diff --git a/test/Makefile b/test/Makefile
@@ -188,20 +188,20 @@ EXTRA_CMD = docker run --rm \
 	--fail-if-warnings
 
 .PHONY: test-extra
-test-extra: output/eisvogel.pdf output/beamertheme-metropolis.pdf
+test-extra: output/eisvogel.pdf #output/beamertheme-metropolis.pdf
 
 output/eisvogel.pdf: eisvogel.md
 	$(EXTRA_CMD) $< \
 	    --output=$@ \
 	    --template=eisvogel \
 	    --pdf-engine=xelatex
 
-output/beamertheme-metropolis.pdf: beamertheme-metropolis.md
-	$(EXTRA_CMD) $< \
-	    --output=$@ \
-	    --to=beamer \
-	    --variable=theme:metropolis \
-	    --variable=themeoptions:numbering=none
+#output/beamertheme-metropolis.pdf: beamertheme-metropolis.md
+#	$(EXTRA_CMD) $< \
+#	    --output=$@ \
+#	    --to=beamer \
+#	    --variable=theme:metropolis \
+#	    --variable=themeoptions:numbering=none
 
 #   ____ _
 #  / ___| | ___  __ _ _ __