From 47f8e35565be01d3c95925f26542923750679f59 Mon Sep 17 00:00:00 2001
From: Tindy X <49061470+tindy2013@users.noreply.github.com>
Date: Wed, 24 Aug 2022 04:21:58 +0800
Subject: [PATCH] Fix build error

Use self-hosted machine for ARM docker build.
---
 .github/workflows/docker.yml | 4 ++--
 scripts/merge_manifest.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d767110..b77876a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -142,7 +142,7 @@ jobs:
 
   armv7_build:
     name: Build ARMv7 Image
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux, ARM64]
     steps:
       - name: Checkout base
         uses: actions/checkout@v2
@@ -215,7 +215,7 @@ jobs:
 
   arm64_build:
     name: Build ARM64 Image
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux, ARM64]
     steps:
       - name: Checkout base
         uses: actions/checkout@v2
diff --git a/scripts/merge_manifest.py b/scripts/merge_manifest.py
index b3aa47f..29f0cf5 100644
--- a/scripts/merge_manifest.py
+++ b/scripts/merge_manifest.py
@@ -7,7 +7,7 @@ TARGET_TAG="latest" if len(sys.argv) < 2 else sys.argv[1]
 args=["docker manifest create {}:{}".format(MAIN_IMAGE_NAME, TARGET_TAG)]
 for i in glob.glob("/tmp/images/*/*.txt"):
     with open(i, "r") as file:
-        args += " --amend {}@{}".format(MAIN_IMAGE_NAME, file.readline())
+        args += " --amend {}@{}".format(MAIN_IMAGE_NAME, file.readline().strip())
 cmd_create="".join(args)
 cmd_push="docker manifest push {}:{}".format(MAIN_IMAGE_NAME, TARGET_TAG)
 os.system(cmd_create)