From 0ec8b3933446f42b080080dbb2914fc1f7207b20 Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Fri, 8 Jun 2018 02:25:26 -0500 Subject: [PATCH] Choose architecture for building docker image Signed-off-by: Alice Frosi --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 77d7c8ff7..46ab996e8 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ LDFLAGS := -w -s GOFLAGS := BINDIR := $(CURDIR)/bin BINARIES := helm tiller +GO_ARCH := amd64 # Required for globs to work correctly SHELL=/bin/bash @@ -60,8 +61,8 @@ check-docker: docker-binary: BINDIR = ./rootfs docker-binary: GOFLAGS += -a -installsuffix cgo docker-binary: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/helm $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/helm - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/tiller + GOOS=linux GOARCH=$(GO_ARCH) CGO_ENABLED=0 $(GO) build -o $(BINDIR)/helm $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/helm + GOOS=linux GOARCH=$(GO_ARCH) CGO_ENABLED=0 $(GO) build -o $(BINDIR)/tiller $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/tiller .PHONY: docker-build docker-build: check-docker docker-binary @@ -72,7 +73,7 @@ docker-build: check-docker docker-binary docker-binary-rudder: BINDIR = ./rootfs docker-binary-rudder: GOFLAGS += -a -installsuffix cgo docker-binary-rudder: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 $(GO) build -o $(BINDIR)/rudder $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/rudder + GOOS=linux GOARCH=$(GO_ARCH) CGO_ENABLED=0 $(GO) build -o $(BINDIR)/rudder $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' k8s.io/helm/cmd/rudder .PHONY: docker-build-experimental docker-build-experimental: check-docker docker-binary docker-binary-rudder