From dcdeb55ff149313bd050cdc984356dc7e4dd7bde Mon Sep 17 00:00:00 2001
From: Danny Rorabaugh <imnasnainaec@gmail.com>
Date: Fri, 8 Nov 2024 09:30:42 -0500
Subject: [PATCH] Take 3

---
 .github/actions/combine-build/action.yml | 3 ---
 .github/workflows/maintenance.yml        | 6 ++----
 maintenance/Dockerfile                   | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/actions/combine-build/action.yml b/.github/actions/combine-build/action.yml
index e532211c6a..c263915e6b 100644
--- a/.github/actions/combine-build/action.yml
+++ b/.github/actions/combine-build/action.yml
@@ -54,9 +54,6 @@ runs:
         username: ${{ inputs.aws_access_key_id }}
         password: ${{ inputs.aws_secret_access_key }}
 
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v2
 
diff --git a/.github/workflows/maintenance.yml b/.github/workflows/maintenance.yml
index f0c2b68109..0fe9e29b2a 100644
--- a/.github/workflows/maintenance.yml
+++ b/.github/workflows/maintenance.yml
@@ -39,13 +39,11 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           fetch-depth: 0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Build maintenance image
         run: |
           deploy/scripts/build.py --components maintenance --arch ${{ matrix.arch }}
         shell: bash
-      - name: Image digest
-        run: |
-          docker image inspect combine_maint:latest -f '{{json .Id}}'
-        shell: bash
diff --git a/maintenance/Dockerfile b/maintenance/Dockerfile
index 4bc9592572..c72f762ab2 100644
--- a/maintenance/Dockerfile
+++ b/maintenance/Dockerfile
@@ -16,7 +16,7 @@
 #   - ARM 64-bit
 ############################################################
 
-FROM --platform=$BUILDPLATFORM public.ecr.aws/thecombine/aws-kubectl:0.4.0-$TARGETARCH
+FROM public.ecr.aws/thecombine/aws-kubectl:0.4.0-$TARGETARCH
 
 USER root