Fix docker re:view version

Author: piti6

.dockerignore

@@ -0,0 +1,2 @@
+*
+!Dockerfile

Dockerfile

@@ -0,0 +1,23 @@
+FROM ruby:3.3-bookworm
+
+# TeX Live + Japanese support for Re:VIEW PDF builds
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    texlive-luatex \
+    texlive-lang-japanese \
+    texlive-lang-cjk \
+    texlive-fonts-recommended \
+    texlive-fonts-extra \
+    texlive-latex-recommended \
+    texlive-latex-extra \
+    texlive-plain-generic \
+    texlive-extra-utils \
+    lmodern \
+    pandoc \
+    nodejs \
+    npm \
+    ghostscript \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN gem install bundler:4.0.3
+
+WORKDIR /book

articles/sty/review-base.sty

@@ -1,8 +1,9 @@
 \ProvidesClass{review-base}[2020/12/31]
 \RequirePackage{ifthen}
 \@ifundefined{Hy@Info}{% for jsbook.cls
+  \PassOptionsToPackage{dvipdfmx}{pxjahyper}
   \RequirePackage[dvipdfmx,bookmarks=true,bookmarksnumbered=true]{hyperref}
-  \RequirePackage[dvipdfmx]{pxjahyper}
+  \RequirePackage{pxjahyper}
   \newif\if@reclscover \@reclscovertrue
   \newcommand{\includefullpagegraphics}[2][]{%
     \thispagestyle{empty}%

articles/sty/review-jsbook.cls

@@ -384,13 +384,14 @@
 
 %% load hyperref package
 \PassOptionsToPackage{hyphens}{url} % URLにハイフンが含まれる場合でも改行されるようにする
+\PassOptionsToPackage{dvipdfmx}{pxjahyper}
 \RequirePackage[dvipdfmx, \if@pdfhyperlink\else draft,\fi
   bookmarks=true,
   bookmarksnumbered=true,
   hidelinks,
   setpagesize=false,
 ]{hyperref}
-\RequirePackage[dvipdfmx]{pxjahyper}
+\RequirePackage{pxjahyper}
 
 %% more useful macros
 %% ----------

articles/sty/techbooster-doujin-base.sty

@@ -60,7 +60,7 @@
 \renewcommand{\captionsize}{\fontsize{9}{9}\selectfont}
 \newlength{\captionnumwidth}
 \setlength{\captionnumwidth}{6zw}
-%\newlength{\captionwidth}
+\@ifundefined{captionwidth}{\newlength{\captionwidth}}{}
 \setlength{\captionwidth}{\textwidth}
 \addtolength{\captionwidth}{-\captionnumwidth}
 \def\captionhead{\sffamily{\color{black!30!white}{▲}}}

build-in-docker-epub.sh

@@ -3,7 +3,14 @@
 [ ! -z $REVIEW_CONFIG_FILE ] || REVIEW_CONFIG_FILE="config-epub-$REVIEW_LANG.yml"
 
 # コマンド手打ちで作業したい時は以下の通り /book に pwd がマウントされます
-# docker run -i -t -v $(pwd):/book vvakame/review:5.1 /bin/bash
+# docker run -i -t -v $(pwd):/book review-custom:5.11 /bin/bash
+
+DOCKER_IMAGE="review-custom:5.11"
+
+# イメージが存在しない場合はビルドする
+if ! docker image inspect "$DOCKER_IMAGE" > /dev/null 2>&1; then
+  docker build -t "$DOCKER_IMAGE" .
+fi
 
 # reduce size of images
 REVIEW_IMAGE_DIR="articles/images_$REVIEW_LANG"
@@ -12,7 +19,7 @@ IMAGEMAGICK_COMMAND='mogrify -format jpg -quality 75 -background white -alpha re
 docker run -v $(pwd)/articles:/articles --entrypoint=sh dpokidov/imagemagick:7.1.0-47-buster -c "${FIND_COMMAND} | xargs ${IMAGEMAGICK_COMMAND}"
 eval "${FIND_COMMAND}" | xargs rm -fr # PNGファイルを一時的に削除
 
-docker run -t --rm -v $(pwd):/book -v $(pwd)/articles/fonts/bizud:/usr/share/fonts/truetype/bizud vvakame/review:5.1 /bin/bash -ci "cd /book && ./setup.sh && REVIEW_CONFIG_FILE=$REVIEW_CONFIG_FILE npm run pdf"
+docker run -t --rm -v $(pwd):/book -v $(pwd)/articles/fonts/bizud:/usr/share/fonts/truetype/bizud "$DOCKER_IMAGE" /bin/bash -ci "cd /book && npm install --ignore-scripts && bundle install && gem pristine --all && REVIEW_CONFIG_FILE=$REVIEW_CONFIG_FILE npm run pdf"
 
 # restore images
 git restore "$REVIEW_IMAGE_DIR"

build-in-docker.sh

@@ -3,6 +3,13 @@
 [ ! -z $REVIEW_CONFIG_FILE ] || REVIEW_CONFIG_FILE="config-$REVIEW_LANG.yml"
 
 # コマンド手打ちで作業したい時は以下の通り /book に pwd がマウントされます
-# docker run -i -t -v $(pwd):/book vvakame/review:5.1 /bin/bash
+# docker run -i -t -v $(pwd):/book review-custom:5.11 /bin/bash
 
-docker run -t --rm -v $(pwd):/book -v $(pwd)/articles/fonts/bizud:/usr/share/fonts/truetype/bizud vvakame/review:5.1 /bin/bash -ci "cd /book && ./setup.sh && REVIEW_CONFIG_FILE=$REVIEW_CONFIG_FILE npm run pdf"
+DOCKER_IMAGE="review-custom:5.11"
+
+# イメージが存在しない場合はビルドする
+if ! docker image inspect "$DOCKER_IMAGE" > /dev/null 2>&1; then
+  docker build -t "$DOCKER_IMAGE" .
+fi
+
+docker run -t --rm -v $(pwd):/book -v $(pwd)/articles/fonts/bizud:/usr/share/fonts/truetype/bizud "$DOCKER_IMAGE" /bin/bash -ci "cd /book && npm install --ignore-scripts && bundle install && gem pristine --all && REVIEW_CONFIG_FILE=$REVIEW_CONFIG_FILE npm run pdf"