From fa78c1add59ebd6791984a406ca38d0f84b05b5f Mon Sep 17 00:00:00 2001
From: Fangxing <fangxing204@gmail.com>
Date: Tue, 20 Jun 2023 22:52:25 +0300
Subject: [PATCH] Support ARM64 images

---
 docker/Dockerfile.fedora | 10 ++++++++--
 docker/Dockerfile.ubuntu | 12 ++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile.fedora b/docker/Dockerfile.fedora
index e57013d1..8f150b88 100644
--- a/docker/Dockerfile.fedora
+++ b/docker/Dockerfile.fedora
@@ -1,6 +1,7 @@
 FROM fedora:34
 
 RUN dnf install -y \
+    curl \
     git \
     graphviz \
     latexmk \
@@ -51,8 +52,13 @@ ENV TEXMFCACHE /tmp/texmf-cache
 
 # Add Tini
 ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
+RUN case ${TARGETPLATFORM} in \
+      "linux/amd64")  TINI_NAME="tini-amd64"  ;; \
+      "linux/arm64")  TINI_NAME="tini-arm64"  ;; \
+       *)             TINI_NAME="tini" ;; \
+    esac && \
+    curl -L  -o /tini "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_NAME}"; \
+    chmod +x /tini
 ENTRYPOINT ["/tini", "--"]
 
 USER runner
diff --git a/docker/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu
index 02187ae3..f298af13 100644
--- a/docker/Dockerfile.ubuntu
+++ b/docker/Dockerfile.ubuntu
@@ -1,8 +1,10 @@
 FROM ubuntu:22.04
 
+# run export LC_ALL="en_US.UTF-8" && dpkg-reconfigure locales
 RUN export DEBIAN_FRONTEND=noninteractive; \
     apt-get update; \
     apt-get install -y \
+    curl\
     git \
     graphviz \
     latexmk \
@@ -22,6 +24,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     ghostscript \
     xindy
 
+
 RUN set -e; \
     apt-get install -y wget; \
     for archive in source-code-pro/archive/2.030R-ro/1.050R-it.zip \
@@ -43,8 +46,13 @@ ENV TEXMFCACHE /tmp/texmf-cache
 
 # Add Tini
 ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
+RUN case ${TARGETPLATFORM} in \
+      "linux/amd64")  TINI_NAME="tini-amd64"  ;; \
+      "linux/arm64")  TINI_NAME="tini-arm64"  ;; \
+       *)             TINI_NAME="tini" ;; \
+    esac && \
+    curl -L  -o /tini "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/${TINI_NAME}"; \
+    chmod +x /tini
 ENTRYPOINT ["/tini", "--"]
 
 USER runner