From 7592032c0f1b856ad1383b73fa3226787f9254e7 Mon Sep 17 00:00:00 2001
From: Ashcon Partovi <ashcon@partovi.net>
Date: Tue, 29 Oct 2024 13:00:22 -0700
Subject: [PATCH] Fix

---
 .github/workflows/build-image.yml | 11 ++++++++++-
 scripts/bootstrap.sh              |  7 ++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 7ebaa03571fda0..034325efe8eb78 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -84,7 +84,16 @@ jobs:
         uses: ./.github/actions/setup-bun
         with:
           bun-version: latest
-      - name: Setup Docker
+      - name: Setup Docker QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+          driver-opts: network=host
+      - name: Setup Docker Login
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 6a367bba8bd294..e31d85334ea9b4 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -414,7 +414,12 @@ install_common_software() {
     software-properties-common
     ;;
   dnf) install_packages \
-    dnf-plugins-core \
+    dnf-plugins-core
+    ;;
+  esac
+
+  case "$distro" in
+  amzn) install_packages \
     tar
     ;;
   esac