From 7b9346f8d54ce25e70bf0a32f61b1d2e6f8aa102 Mon Sep 17 00:00:00 2001
From: Julian van den Berkmortel <julianvdberkmortel@outlook.com>
Date: Wed, 3 Nov 2021 18:46:17 +0100
Subject: [PATCH] Specify the arch passed as build arg in the distroless image
 (#848)

---
 Dockerfile    | 3 ++-
 skaffold.yaml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 480a7a9dc..495907fd5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 # Update the base image in Makefile when updating golang version. This has to
 # be pre-pulled in order to work on GCB.
+ARG ARCH
 FROM golang:1.17.1 as build
 
 RUN apt-get update && apt-get --no-install-recommends install -y libcap2-bin && apt-get clean && rm -rf /var/lib/apt/lists/* 
@@ -19,7 +20,7 @@ ARG GIT_TAG
 RUN make metrics-server
 RUN setcap cap_net_bind_service=+ep metrics-server
 
-FROM gcr.io/distroless/static:latest
+FROM gcr.io/distroless/static:latest-$ARCH
 COPY --from=build /go/src/sigs.k8s.io/metrics-server/metrics-server /
 USER 65534
 ENTRYPOINT ["/metrics-server"]
diff --git a/skaffold.yaml b/skaffold.yaml
index bb1489d46..67863002a 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -11,6 +11,7 @@ build:
     docker:
       dockerfile: Dockerfile
       buildArgs:
+        ARCH: "amd64"
         GIT_TAG: "devel"
 deploy:
   kustomize:
@@ -34,4 +35,4 @@ profiles:
               image.repository: "{{.IMAGE_REPO}}"
               image.tag: "{{.IMAGE_TAG}}"
             valuesFiles:
-              - charts/metrics-server/ci/ci-values.yaml
\ No newline at end of file
+              - charts/metrics-server/ci/ci-values.yaml