Skip to content

Commit

Permalink
Bump pandoc version to 2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
frozenbonito committed Sep 7, 2020
1 parent a456706 commit d27a941
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
17 changes: 5 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
ARG pandoc_version="2.9.2.1"
ARG pandoc_version="2.10"
FROM pandoc/latex:${pandoc_version}

ARG pandoc_version

RUN tlmgr install adjustbox \
RUN tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet \
&& tlmgr install adjustbox \
babel-japanese \
background \
collectbox \
Expand All @@ -24,20 +25,12 @@ RUN tlmgr install adjustbox \
haranoaji \
ipaex

ARG eisvogel_version="1.4.0"
ARG eisvogel_version="1.5.0"
RUN mkdir -p /root/.pandoc/templates \
&& wget https://raw.githubusercontent.com/Wandmalfarbe/pandoc-latex-template/v${eisvogel_version}/eisvogel.tex \
-O /root/.pandoc/templates/eisvogel.latex

ARG crossref_version="0.3.6.2a"
RUN mkdir -p /tmp/pandoc-crossref \
&& wget https://github.com/lierdakil/pandoc-crossref/releases/download/v${crossref_version}/pandoc-crossref-Linux-${pandoc_version}.tar.xz \
-O /tmp/pandoc-crossref.tar.xz \
&& tar -Jxv -C /tmp/pandoc-crossref -f /tmp/pandoc-crossref.tar.xz \
&& mv /tmp/pandoc-crossref/pandoc-crossref /usr/local/bin \
&& rm -rf /tmp/pandoc-crossref.tar.xz /tmp/pandoc-crossref

RUN mkdir -p /root/.pandoc/defaults
COPY default.yaml /root/.pandoc/defaults/default.yaml

ENTRYPOINT [ "docker-entrypoint.sh", "-d", "default" ]
ENTRYPOINT [ "/usr/local/bin/pandoc", "-d", "default" ]
12 changes: 9 additions & 3 deletions plantuml/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
FROM frozenbonito/pandoc-eisvogel-ja

RUN apk add --no-cache openjdk11 graphviz ttf-droid ttf-droid-nonlatin python3
RUN apk add --no-cache \
graphviz \
openjdk11 \
python3 \
py3-pip \
ttf-droid \
ttf-droid-nonlatin

ARG plantuml_version="1.2020.8"
ARG plantuml_version="1.2020.16"
RUN wget https://sourceforge.net/projects/plantuml/files/plantuml.${plantuml_version}.jar/download -O /root/plantuml.jar

RUN pip3 install --upgrade pip
Expand All @@ -12,4 +18,4 @@ ENV PLANTUML_BIN="java -jar /root/plantuml.jar"

COPY plantuml.yaml /root/.pandoc/defaults/plantuml.yaml

ENTRYPOINT [ "docker-entrypoint.sh", "-d", "default", "-d", "plantuml" ]
ENTRYPOINT [ "/usr/local/bin/pandoc", "-d", "default", "-d", "plantuml" ]

0 comments on commit d27a941

Please sign in to comment.