From 73f8c80859fa345f83d5d4971b5b2dd70861c0d5 Mon Sep 17 00:00:00 2001
From: Takaharu Nakamura <64473501+appare45@users.noreply.github.com>
Date: Mon, 11 Nov 2024 18:41:34 +0900
Subject: [PATCH 01/16] =?UTF-8?q?CI=E3=81=ABarm64=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b23b70..a076d86 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,6 +29,11 @@ jobs:
       - name: Set up Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64/v8
+
       - name: Login to ghcr.io
         uses: docker/login-action@v3
         with:
@@ -41,6 +46,7 @@ jobs:
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

From 158548e29494fc3a4a065e6fe2d3cc1519a617fc Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:18:19 +0900
Subject: [PATCH 02/16] =?UTF-8?q?=E8=89=B2=E3=80=85=E7=9B=B4=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 56 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a3a5171..e253f90 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,14 @@
-FROM debian:stable-20220316-slim
+FROM ubuntu:noble AS base
+ARG TARGETARCH
+
+FROM base AS build-arm64
+ENV PLATFORM aarch64-linux
+
+FROM base AS build-amd64
+ENV PLATFORM x86_64-linux
+
 # WORD内部向けコンテナなので、何か問題が有ったらSlack上で通知して下さい。
-MAINTAINER Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>
+LABEL MAINTAINER="Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>"
 
 ENV PERSISTENT_DEPS \
     tar \
@@ -43,21 +51,29 @@ 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 && \
-    printf "%s\n" \
-      "TEXDIR $TEXLIVE_PATH" \
-      "selected_scheme scheme-small" \
-      "option_doc 0" \
-      "option_src 0" \
-      "option_autobackup 0" \
-      > /tmp/install-tl-unx/texlive.profile && \
-    /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
+# 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 && \
+#     printf "%s\n" \
+#       "TEXDIR $TEXLIVE_PATH" \
+#       "selected_scheme scheme-small" \
+#       "option_doc 0" \
+#       "option_src 0" \
+#       "option_autobackup 0" \
+#       > /tmp/install-tl-unx/texlive.profile && \
+#     /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
+
+COPY --from=registry.gitlab.com/islandoftex/images/texlive:TL2024-2024-11-10-small /usr/local/texlive /usr/local/texlive
+
+RUN echo "Set PATH to $PATH" && \
+    $(find /usr/local/texlive -name tlmgr) path add
+
+ENV TEX_LIVE_VERSION 2024
+ENV PATH /usr/local/texlive/$TEX_LIVE_VERSION/bin/$PLATFORM:$PATH
 
 # tlmgr section
 RUN tlmgr update --self
@@ -72,14 +88,12 @@ RUN tlmgr install --no-persistent-downloads \
       ebgaramond algorithms algorithmicx xstring siunitx bussproofs enumitem
 
 # EBGaramond
-RUN cp /usr/share/fonts/opentype/ebgaramond/EBGaramond12-Regular.otf /usr/share/fonts/opentype/EBGaramond.otf && \
+RUN cp /usr/share/fonts/opentype/ebgaramond/EBGaramond12-Regular.otf "/usr/share/fonts/opentype/EB Garamond.otf" && \
     fc-cache -frvv && \
     luaotfload-tool --update
 
-ARG TARGETARCH
-
 # Install Pandoc
-ENV PANDOC_VERSION 3.2.1
+ENV PANDOC_VERSION 3.5
 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 - && \

From aa408ba4d1c0ae84e9454dc0b8325211910dd564 Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:39:05 +0900
Subject: [PATCH 03/16] =?UTF-8?q?=E5=B0=8F=E6=96=87=E5=AD=97=E3=82=89?=
 =?UTF-8?q?=E3=81=97=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e253f90..6b0a268 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ FROM base AS build-amd64
 ENV PLATFORM x86_64-linux
 
 # WORD内部向けコンテナなので、何か問題が有ったらSlack上で通知して下さい。
-LABEL MAINTAINER="Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>"
+LABEL maintainer="Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>"
 
 ENV PERSISTENT_DEPS \
     tar \

From 5dcd27d08cee147c6a34d5d2974796b56dc00f20 Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:39:22 +0900
Subject: [PATCH 04/16] =?UTF-8?q?arch=E6=8C=87=E5=AE=9A=E3=82=92=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=97=E3=81=A6=E3=81=BF=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6b0a268..0d81686 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,12 @@ FROM ubuntu:noble AS base
 ARG TARGETARCH
 
 FROM base AS build-arm64
-ENV PLATFORM aarch64-linux
+ENV AWS_CLI_ARCH linux-aarch64
+ENV TEX_LIVE_ARCH aarch64-linux
 
 FROM base AS build-amd64
-ENV PLATFORM x86_64-linux
+ENV AWS_CLI_ARCH linux-x86_64
+ENV TEX_LIVE_ARCH x86_64-linux
 
 # WORD内部向けコンテナなので、何か問題が有ったらSlack上で通知して下さい。
 LABEL maintainer="Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>"
@@ -31,7 +33,7 @@ RUN apt-get update && \
     tzdata $PERSISTENT_DEPS
 
 # install awscliv2
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+RUN curl "https://awscli.amazonaws.com/awscli-exe-$AWS_CLI_ARCH.zip" -o "awscliv2.zip" && \
     unzip awscliv2.zip && \
     ./aws/install && \
     rm -r ./aws awscliv2.zip
@@ -73,7 +75,7 @@ RUN echo "Set PATH to $PATH" && \
     $(find /usr/local/texlive -name tlmgr) path add
 
 ENV TEX_LIVE_VERSION 2024
-ENV PATH /usr/local/texlive/$TEX_LIVE_VERSION/bin/$PLATFORM:$PATH
+ENV PATH /usr/local/texlive/$TEX_LIVE_VERSION/bin/$TEX_LIVE_ARCH:$PATH
 
 # tlmgr section
 RUN tlmgr update --self

From 51fbd2169a7e6ff2fb4e85e7eeacf435f70a7fbb Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:50:56 +0900
Subject: [PATCH 05/16] fix

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 0d81686..cdd22e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,6 +9,8 @@ FROM base AS build-amd64
 ENV AWS_CLI_ARCH linux-x86_64
 ENV TEX_LIVE_ARCH x86_64-linux
 
+FROM build-${TARGETARCH}
+
 # WORD内部向けコンテナなので、何か問題が有ったらSlack上で通知して下さい。
 LABEL maintainer="Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>"
 

From 9e479dedfeebdfefe28c4df13711e290ed7fb15e Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 15:29:33 +0900
Subject: [PATCH 06/16] =?UTF-8?q?matrix=E3=82=92=E4=BD=BF=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=BF=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a076d86..f347507 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,12 @@ jobs:
   build-image:
     name: Build and push image
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
     steps:
       - uses: actions/checkout@v4
 
@@ -32,7 +38,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
-          platforms: linux/amd64,linux/arm64/v8
+          platforms: ${{ matrix.platform }}
 
       - name: Login to ghcr.io
         uses: docker/login-action@v3
@@ -46,7 +52,7 @@ jobs:
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          platforms: linux/amd64,linux/arm64/v8
+          platforms: ${{ matrix.platform }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha

From 11322c573dd7752657a32db89c46d25f183980d3 Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 15:36:28 +0900
Subject: [PATCH 07/16] fix

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index cdd22e6..769cc7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ENV TEX_LIVE_ARCH x86_64-linux
 FROM build-${TARGETARCH}
 
 # WORD内部向けコンテナなので、何か問題が有ったらSlack上で通知して下さい。
-LABEL maintainer="Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>"
+LABEL maintainer "Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>"
 
 ENV PERSISTENT_DEPS \
     tar \

From 3d9ca62059bed296c3f041957fa2a22a666faf2d Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 15:54:00 +0900
Subject: [PATCH 08/16] =?UTF-8?q?Dockerfile=E3=81=AE=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E3=81=8C=E5=87=BA=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 44 +++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 769cc7d..2988168 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,32 +2,19 @@ FROM ubuntu:noble AS base
 ARG TARGETARCH
 
 FROM base AS build-arm64
-ENV AWS_CLI_ARCH linux-aarch64
-ENV TEX_LIVE_ARCH aarch64-linux
+ENV AWS_CLI_ARCH=linux-aarch64
+ENV TEX_LIVE_ARCH=aarch64-linux
 
 FROM base AS build-amd64
-ENV AWS_CLI_ARCH linux-x86_64
-ENV TEX_LIVE_ARCH x86_64-linux
+ENV AWS_CLI_ARCH=linux-x86_64
+ENV TEX_LIVE_ARCH=x86_64-linux
 
 FROM build-${TARGETARCH}
 
 # WORD内部向けコンテナなので、何か問題が有ったらSlack上で通知して下さい。
-LABEL maintainer "Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>"
-
-ENV PERSISTENT_DEPS \
-    tar \
-    fontconfig \
-    unzip \
-    wget \
-    curl \
-    make \
-    perl \
-    ghostscript \
-    bash \
-    git \
-    groff \
-    less \
-    fonts-ebgaramond
+LABEL maintainer="Totsugekitai <37617413+Totsugekitai@users.noreply.github.com>"
+
+ENV PERSISTENT_DEPS="tar fontconfig unzip wget curl make perl ghostscript bash git groff less fonts-ebgaramond"
 
 # キャッシュ修正とパッケージインストールは同時にやる必要がある
 RUN apt-get update && \
@@ -40,11 +27,10 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-$AWS_CLI_ARCH.zip" -o "awscliv
     ./aws/install && \
     rm -r ./aws awscliv2.zip
 
-ENV FONT_URLS \
-    https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip \
+ENV FONT_URLS="https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip \
     https://github.com/adobe-fonts/source-han-sans/releases/latest/download/SourceHanSansJP.zip \
-    https://github.com/adobe-fonts/source-han-serif/raw/release/SubsetOTF/SourceHanSerifJP.zip
-ENV FONT_PATH /usr/share/fonts/
+    https://github.com/adobe-fonts/source-han-serif/raw/release/SubsetOTF/SourceHanSerifJP.zip"
+ENV FONT_PATH="/usr/share/fonts/"
 RUN mkdir -p $FONT_PATH && \
       wget $FONT_URLS && \
       unzip -j "*.zip" "*.otf" -d $FONT_PATH && \
@@ -76,8 +62,8 @@ COPY --from=registry.gitlab.com/islandoftex/images/texlive:TL2024-2024-11-10-sma
 RUN echo "Set PATH to $PATH" && \
     $(find /usr/local/texlive -name tlmgr) path add
 
-ENV TEX_LIVE_VERSION 2024
-ENV PATH /usr/local/texlive/$TEX_LIVE_VERSION/bin/$TEX_LIVE_ARCH:$PATH
+ENV TEX_LIVE_VERSION="2024"
+ENV PATH="/usr/local/texlive/$TEX_LIVE_VERSION/bin/$TEX_LIVE_ARCH:$PATH"
 
 # tlmgr section
 RUN tlmgr update --self
@@ -97,9 +83,9 @@ RUN cp /usr/share/fonts/opentype/ebgaramond/EBGaramond12-Regular.otf "/usr/share
     luaotfload-tool --update
 
 # Install Pandoc
-ENV PANDOC_VERSION 3.5
-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 PANDOC_VERSION="3.5"
+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/

From bab9a2917dbd865665f24fc64700e618713c9897 Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 16:47:44 +0900
Subject: [PATCH 09/16] =?UTF-8?q?path=E3=81=AE=E9=80=9A=E3=81=97=E6=96=B9?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2988168..510145f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,14 +57,11 @@ RUN cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime && \
 
 # ENV PATH $TEXLIVE_PATH/bin/x86_64-linux:$TEXLIVE_PATH/bin/aarch64-linux:$PATH
 
-COPY --from=registry.gitlab.com/islandoftex/images/texlive:TL2024-2024-11-10-small /usr/local/texlive /usr/local/texlive
+COPY --from=registry.gitlab.com/islandoftex/images/texlive:small /usr/local/texlive /usr/local/texlive
 
 RUN echo "Set PATH to $PATH" && \
     $(find /usr/local/texlive -name tlmgr) path add
 
-ENV TEX_LIVE_VERSION="2024"
-ENV PATH="/usr/local/texlive/$TEX_LIVE_VERSION/bin/$TEX_LIVE_ARCH:$PATH"
-
 # tlmgr section
 RUN tlmgr update --self
 
@@ -75,7 +72,8 @@ RUN tlmgr install --no-persistent-downloads \
       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
+      ebgaramond algorithms algorithmicx xstring siunitx bussproofs enumitem && \
+    tlmgr path add
 
 # EBGaramond
 RUN cp /usr/share/fonts/opentype/ebgaramond/EBGaramond12-Regular.otf "/usr/share/fonts/opentype/EB Garamond.otf" && \

From 90d9def8b311353f5adf319461b6b3a16a99522f Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 16:49:02 +0900
Subject: [PATCH 10/16] =?UTF-8?q?tag=E6=8C=87=E5=AE=9A=E3=83=9F=E3=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 510145f..528d92d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,10 +32,10 @@ ENV FONT_URLS="https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/
     https://github.com/adobe-fonts/source-han-serif/raw/release/SubsetOTF/SourceHanSerifJP.zip"
 ENV FONT_PATH="/usr/share/fonts/"
 RUN mkdir -p $FONT_PATH && \
-      wget $FONT_URLS && \
-      unzip -j "*.zip" "*.otf" -d $FONT_PATH && \
-      rm *.zip && \
-      fc-cache -f -v
+    wget $FONT_URLS && \
+    unzip -j "*.zip" "*.otf" -d $FONT_PATH && \
+    rm *.zip && \
+    fc-cache -f -v
 
 RUN cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime && \
     echo 'Asia/Tokyo' > /etc/timezone
@@ -57,7 +57,7 @@ RUN cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime && \
 
 # ENV PATH $TEXLIVE_PATH/bin/x86_64-linux:$TEXLIVE_PATH/bin/aarch64-linux:$PATH
 
-COPY --from=registry.gitlab.com/islandoftex/images/texlive:small /usr/local/texlive /usr/local/texlive
+COPY --from=registry.gitlab.com/islandoftex/images/texlive:latest-small /usr/local/texlive /usr/local/texlive
 
 RUN echo "Set PATH to $PATH" && \
     $(find /usr/local/texlive -name tlmgr) path add

From 7acd2f2ffe4edadb9b12a8d64c646cee8035dfd9 Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 17:34:13 +0900
Subject: [PATCH 11/16] =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7?=
 =?UTF-8?q?=E3=83=A5=E7=A2=BA=E8=AA=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 528d92d..37c1a0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,8 +28,8 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-$AWS_CLI_ARCH.zip" -o "awscliv
     rm -r ./aws awscliv2.zip
 
 ENV FONT_URLS="https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip \
-    https://github.com/adobe-fonts/source-han-sans/releases/latest/download/SourceHanSansJP.zip \
-    https://github.com/adobe-fonts/source-han-serif/raw/release/SubsetOTF/SourceHanSerifJP.zip"
+      https://github.com/adobe-fonts/source-han-sans/releases/latest/download/SourceHanSansJP.zip \
+      https://github.com/adobe-fonts/source-han-serif/raw/release/SubsetOTF/SourceHanSerifJP.zip"
 ENV FONT_PATH="/usr/share/fonts/"
 RUN mkdir -p $FONT_PATH && \
     wget $FONT_URLS && \

From ad9665479a9479760bfdae9b576083568aa6ea84 Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:25:34 +0900
Subject: [PATCH 12/16] =?UTF-8?q?arm64=E3=82=92macos-latest=E3=81=AB?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f347507..47ae6cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,13 +12,15 @@ name: CI
 jobs:
   build-image:
     name: Build and push image
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm64
+        include:
+          - os: ubuntu-latest
+            platform: linux/amd64
+          - os: macos-latest
+            platform: linux/arm64
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
 

From b489feca229f24ff720b3492eaca91fdef379a75 Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:34:37 +0900
Subject: [PATCH 13/16] fix

---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 47ae6cd..013a792 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,12 @@ jobs:
             platform: linux/arm64
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install Docker and start Colima on macOS
+        if: matrix.os == 'macos-latest'
+        run: |
+          brew install docker
+          colima start
+
       - uses: actions/checkout@v4
 
       - name: Docker meta

From c6273365db17f4b951554a2f510f4fbe2b1add98 Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:42:04 +0900
Subject: [PATCH 14/16] fix

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 013a792..3fb0c8c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,10 @@ jobs:
         if: matrix.os == 'macos-latest'
         run: |
           brew install docker
-          colima start
+          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
 

From 07d2a9c38a73ab0f0ebcfab84dc5be1050b68a7a Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:57:12 +0900
Subject: [PATCH 15/16] =?UTF-8?q?=E3=83=80=E3=83=96=E3=83=AB=E3=82=AF?=
 =?UTF-8?q?=E3=82=AA=E3=83=BC=E3=83=88=E3=82=92=E3=81=A4=E3=81=91=E3=82=8D?=
 =?UTF-8?q?=E3=81=A8=E8=A8=80=E3=82=8F=E3=82=8C=E3=81=9F=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?=E5=85=A5=E3=82=8C=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3fb0c8c..c8e73ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install Docker and start Colima on macOS
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == '"macos-latest"'
         run: |
           brew install docker
           brew install colima

From 489e913e1c40d69e8f227fd57b7a4f8d15a86a48 Mon Sep 17 00:00:00 2001
From: Till0196 <16399842+Till0196@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:59:27 +0900
Subject: [PATCH 16/16] =?UTF-8?q?=E3=81=AA=E3=82=93=E3=81=8B=E3=81=A0?=
 =?UTF-8?q?=E3=82=81=E3=81=AA=E3=81=AE=E3=81=A7=E6=88=BB=E3=81=99=E3=80=82?=
 =?UTF-8?q?=E3=82=B7=E3=82=A7=E3=83=AB=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=81=AF=E5=A4=9A=E5=88=86=E3=82=AD=E3=83=AC=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c8e73ed..3fb0c8c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install Docker and start Colima on macOS
-        if: matrix.os == '"macos-latest"'
+        if: matrix.os == 'macos-latest'
         run: |
           brew install docker
           brew install colima