From 621f6067ec021e647e030a3ddf4f5267bbe44cbb Mon Sep 17 00:00:00 2001 From: Yoshimura Yuu Date: Mon, 10 Apr 2023 19:18:04 +0900 Subject: [PATCH] Add pandoc install to Dockerfile --- .github/workflows/ci.yml | 2 +- Dockerfile | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68c5d66..fea1d3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ name: CI jobs: build-image: name: Build and push image - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index 4157971..2bdcf01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,6 @@ ENV PERSISTENT_DEPS \ less \ fonts-ebgaramond -ENV TEXLIVE_PATH /usr/local/texlive -ENV PATH $TEXLIVE_PATH/bin/x86_64-linux:$PATH - # キャッシュ修正とパッケージインストールは同時にやる必要がある RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ @@ -46,6 +43,7 @@ RUN cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime && \ echo 'Asia/Tokyo' > /etc/timezone # Install TeXLive +ENV TEXLIVE_PATH /usr/local/texlive RUN mkdir -p /tmp/install-tl-unx && \ wget -qO- http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz | \ tar -xz -C /tmp/install-tl-unx --strip-components=1 && \ @@ -59,6 +57,8 @@ RUN mkdir -p /tmp/install-tl-unx && \ /tmp/install-tl-unx/install-tl \ -profile /tmp/install-tl-unx/texlive.profile +ENV PATH $TEXLIVE_PATH/bin/x86_64-linux:$TEXLIVE_PATH/bin/aarch64-linux:$PATH + # tlmgr section RUN tlmgr update --self @@ -76,6 +76,16 @@ RUN cp /usr/share/fonts/opentype/ebgaramond/EBGaramond12-Regular.otf /usr/share/ fc-cache -frvv && \ luaotfload-tool --update +ARG TARGETARCH + +# Install Pandoc +ENV PANDOC_VERSION 3.1.2 +ENV PANDOC_DOWNLOAD_URL https://github.com/jgm/pandoc/releases/download/$PANDOC_VERSION/pandoc-$PANDOC_VERSION-linux-$TARGETARCH.tar.gz +ENV PANDOC_ROOT /usr/local/bin/pandoc +RUN wget -qO- "$PANDOC_DOWNLOAD_URL" | tar -xzf - && \ + cp pandoc-$PANDOC_VERSION/bin/pandoc $PANDOC_ROOT && \ + rm -Rf pandoc-$PANDOC_VERSION/ + VOLUME ["/workdir"] WORKDIR /workdir