From 36938a7e0d87feb38188eae367eee8c680e442c2 Mon Sep 17 00:00:00 2001 From: Jon Snyder Date: Sat, 27 Apr 2024 14:49:04 -0700 Subject: [PATCH 1/2] fix: do not hard-code arch to amd64 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8b227953..323d39d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG golang_version FROM $builder_image:$golang_version as builder ARG service_alias -ARG target_arch=amd64 +ARG TARGETARCH # The tuple of controller image version information ARG service_controller_git_version ARG service_controller_git_commit @@ -22,7 +22,7 @@ ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller WORKDIR $work_dir ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=on -ENV GOARCH=$target_arch +ENV GOARCH=$TARGETARCH ENV GOOS=linux ENV CGO_ENABLED=0 ENV VERSION_PKG=github.com/aws-controllers-k8s/$service_alias-controller/pkg/version From ba614523271e5f468f27b5cb2c442712683b68b9 Mon Sep 17 00:00:00 2001 From: Jon Snyder Date: Sat, 27 Apr 2024 14:50:42 -0700 Subject: [PATCH 2/2] fix: do not hard-code arch to amd64 in Dockerfile.local --- Dockerfile.local | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.local b/Dockerfile.local index c9789f68..1a6f6468 100644 --- a/Dockerfile.local +++ b/Dockerfile.local @@ -15,14 +15,14 @@ ARG service_alias ARG service_controller_git_version ARG service_controller_git_commit ARG build_date -ARG target_arch=amd64 +ARG TARGETARCH # The directory within the builder container into which we will copy our # service controller code. ARG work_dir=/github.com/aws-controllers-k8s/$service_alias-controller WORKDIR $work_dir ENV GOPROXY=https://proxy.golang.org|direct ENV GO111MODULE=on -ENV GOARCH=$target_arch +ENV GOARCH=$TARGETARCH ENV GOOS=linux ENV CGO_ENABLED=0 ENV VERSION_PKG=github.com/aws-controllers-k8s/$service_alias-controller/pkg/version