Updated Dockerfile to support multi-arch (#535)

* Updated Dockerfile to support multi-arch
Updated Makefile to use docker buildx

* Remove GOPROXY

* Added TARGETOS and TARGETARCH as ARG

* minor change

Dockerfile

@@ -1,5 +1,7 @@
+# syntax=docker/dockerfile:experimental
+
 # Build the controller binary
-FROM golang:1.14 as builder
+FROM --platform=${TARGETPLATFORM} golang:1.16 as builder
 
 WORKDIR /workspace
 
@@ -8,12 +10,15 @@ COPY . ./
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
+ARG TARGETOS
+ARG TARGETARCH
+
 # Build
 ENV VERSION_PKG=github.com/aws/aws-app-mesh-controller-for-k8s/pkg/version
 RUN GIT_VERSION=$(git describe --tags --dirty --always) && \
     GIT_COMMIT=$(git rev-parse HEAD) && \
     BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%S%z) && \
-    CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build \
+    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} GO111MODULE=on go build \
     -ldflags="-X ${VERSION_PKG}.GitVersion=${GIT_VERSION} -X ${VERSION_PKG}.GitCommit=${GIT_COMMIT} -X ${VERSION_PKG}.BuildDate=${BUILD_DATE}" -a -o controller main.go
 
 # Build the container image

Makefile

@@ -77,8 +77,10 @@ generate: controller-gen
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 # Build the docker image
+# Requires buildx to be installed: https://docs.docker.com/buildx/working-with-buildx/
+# By default the TARGETPLATFORM is set to linux/amd64, change the value if you are building for linux/arm64
 docker-build: check-env test
-	docker build . -t $(IMAGE)
+	docker buildx build --platform linux/amd64 -t $(IMAGE) . --load
 
 docker-push: check-env
 	docker push $(IMAGE)
@@ -132,7 +134,7 @@ endif
 check-env:
 	@:$(call check_var, AWS_ACCOUNT, AWS account ID for publishing docker images)
 	@:$(call check_var, AWS_REGION, AWS region for publishing docker images)
-
+	
 check_var = \
     $(strip $(foreach 1,$1, \
         $(call __check_var,$1,$(strip $(value 2)))))