キャッシュを複数ポイントで持つようにした

.github/workflows/ci.yml

@@ -15,28 +15,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: ubuntu-latest
-            platform: linux/amd64
-          - os: macos-latest
-            platform: linux/arm64
-    runs-on: ${{ matrix.os }}
+        platform:
+          - linux/amd64
+          - linux/arm64
+    runs-on: ubuntu-latest
     steps:
       - name: Prepare
         run: |
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
           echo "REGISTRY_IMAGE=`echo ghcr.io/${{github.repository}} | tr '[:upper:]' '[:lower:]'`" >> ${GITHUB_ENV}
 
-      - name: Install Docker and start Colima on macOS
-        if: matrix.os == 'macos-latest'
-        run: |
-          brew install docker
-          brew install colima
-          LIMACTL_PATH=$(brew --prefix)/bin/limactl
-          sudo curl -L -o $LIMACTL_PATH https://github.com/mikekazakov/lima-nohvf/raw/master/limactl && sudo chmod +x $LIMACTL_PATH
-          colima start --network-address --arch arm64 --vm-type=qemu
-
       - uses: actions/checkout@v4
 
       - name: Docker meta
@@ -60,6 +49,28 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Package Cache
+        uses: actions/cache@v4
+        id: cache
+        with:
+          path: |
+            tlmgr-pkgs
+            var-cache-apt
+            var-lib-apt-lists
+          key: cache-pkgs-${{ env.PLATFORM_PAIR }}
+
+      - name: inject cache into docker
+        # v3.1.2のcommitを指定
+        uses: reproducible-containers/buildkit-cache-dance@5b6db76d1da5c8b307d5d2e0706d266521b710de
+        with:
+          cache-map: |
+            {
+              "tlmgr-pkgs": "/tlmgr-pkgs",
+              "var-cache-apt": "/var/cache/apt",
+              "var-lib-apt-lists": "/var/lib/apt/lists"
+            }
+          skip-extraction: false
+
       - name: Build and push by digest
         id: build
         uses: docker/build-push-action@v6

Dockerfile

@@ -14,12 +14,17 @@ FROM build-${TARGETARCH}
 # WORD内部向けコンテナなので、何か問題が有ったらSlack上で通知して下さい。
 LABEL maintainer="Totsugekitai <[email protected]>"
 
-ENV PERSISTENT_DEPS="tar fontconfig unzip wget curl make perl ghostscript bash git groff less fonts-ebgaramond"
+ENV PERSISTENT_DEPS="tzdata tar fontconfig unzip wget curl make perl ghostscript bash git groff less fonts-ebgaramond"
 
 # キャッシュ修正とパッケージインストールは同時にやる必要がある
-RUN apt-get update && \
+RUN rm -f /etc/apt/apt.conf.d/docker-clean && \
+    echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
+
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
+    apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    tzdata $PERSISTENT_DEPS
+    $PERSISTENT_DEPS
 
 # install awscliv2
 RUN curl "https://awscli.amazonaws.com/awscli-exe-$AWS_CLI_ARCH.zip" -o "awscliv2.zip" && \
@@ -65,14 +70,19 @@ RUN echo "Set PATH to $PATH" && \
 # tlmgr section
 RUN tlmgr update --self
 
+# /tlmgr-pkgsにtlmgrのパッケージをバックアップして次回以降のビルド時に再利用する
 # package install
-RUN tlmgr install --no-persistent-downloads \
+RUN --mount=type=cache,target=/tlmgr-pkgs,sharing=locked \
+    tlmgr restore --force --backupdir /tlmgr-pkgs --all || true && \
+    tlmgr install --no-persistent-downloads \
       latexmk collection-luatex collection-langjapanese \
       collection-fontsrecommended type1cm mdframed needspace newtx \
       fontaxes boondox everyhook svn-prov framed subfiles titlesec \
       tocdata xpatch etoolbox l3packages \
       biblatex pbibtex-base logreq biber import environ trimspaces tcolorbox \
       ebgaramond algorithms algorithmicx xstring siunitx bussproofs enumitem && \
+    tlmgr backup --clean --backupdir /tlmgr-pkgs --all && \
+    tlmgr backup --backupdir /tlmgr-pkgs --all && \
     tlmgr path add
 
 # EBGaramond