Update pandoc

Author: y-yu

.github/workflows/ci.yml

@@ -13,10 +13,10 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Docker Build
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
 
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
@@ -27,7 +27,12 @@ jobs:
       continue-on-error: true
 
     - name: Build Docker image
-      run: docker-compose build
+      uses: docker/build-push-action@v3
+      with:
+        file: ./docker/Dockerfile
+        platforms: linux/amd64
+        push: true
+        tags: ghcr.io/rust-lang-ja/book-ja-pdf:latest
 
     - name: PDF build
       run: docker-compose up --abort-on-container-exit

docker-compose.yml

@@ -9,3 +9,4 @@ services:
         - ghcr.io/rust-lang-ja/book-ja-pdf:latest
     volumes:
       - .:/workdir
+    tty: true

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM pandoc/core:2.16
+FROM alpine:3.16
 
 LABEL maintainer="YOSHIMRUA Hikaru <yyu [at] mental.poker>"
 
@@ -21,6 +21,12 @@ ENV FONT_DEPS \
 
 ENV FONT_PATH /usr/share/fonts/
 
+ARG TARGETARCH
+
+ENV PANDOC_VERSION 2.18
+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
+
 ENV PERSISTENT_DEPS \
     py-pip \
     rust \
@@ -82,6 +88,11 @@ RUN mkdir -p $FONT_PATH && \
     fc-cache -f -v && \
     apk del .font-deps 
 
+# Install Pandoc
+RUN wget -qO- "$PANDOC_DOWNLOAD_URL" | tar -xzf - && \
+    cp pandoc-$PANDOC_VERSION/bin/pandoc $PANDOC_ROOT && \
+    rm -Rf pandoc-$PANDOC_VERSION/
+
 # Install Pandocfilter
 COPY requirements.txt ./
 RUN pip install --upgrade pip && \

setup.sh

@@ -43,10 +43,9 @@ if [[ ! -d "./target" ]]; then
 fi
 
 # Copy markdown files to the working directory
-for f in ./book-ja/docs/markdown/*.md; do
+for f in ./book-ja/src/*.md; do
   cp "$f" target/
 done
-cp ./book-ja/src/SUMMARY.md ./target/
 
 python3 python/fix_table.py < target/appendix-02-operators.md > target/tmp.md
 mv target/tmp.md target/appendix-02-operators.md