Skip to content

Commit

Permalink
Enable push and adjust packages
Browse files Browse the repository at this point in the history
  • Loading branch information
reijoh committed Mar 21, 2024
1 parent 46256aa commit 8559bdc
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 61 deletions.
7 changes: 1 addition & 6 deletions .github/workflows/build-manual.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 8 additions & 6 deletions common/extra/packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ trimspaces
abstract
adjustbox
awesomebox
babel-german
#babel-german
background
bidi
catchfile
Expand Down Expand Up @@ -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
82 changes: 41 additions & 41 deletions common/latex/packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/latex/texlive.profile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

# ____ _
# / ___| | ___ __ _ _ __
Expand Down

0 comments on commit 8559bdc

Please sign in to comment.