Skip to content

Commit

Permalink
Merge pull request #1082 from aledbf/fix-build
Browse files Browse the repository at this point in the history
Fix build tasks
  • Loading branch information
aledbf authored Aug 8, 2017
2 parents 77c8df5 + f840b07 commit 1b41e80
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions controllers/nginx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ ARCH ?= $(shell go env GOARCH)
GOARCH = ${ARCH}
DUMB_ARCH = ${ARCH}

ALL_ARCH = amd64 arm ppc64le
ALL_ARCH = amd64 arm arm64 ppc64le

QEMUVERSION=v2.7.0
QEMUVERSION=v2.9.1

IMGNAME = nginx-ingress-controller
IMAGE = $(REGISTRY)/$(IMGNAME)
Expand All @@ -42,9 +42,9 @@ ifeq ($(ARCH),arm)
GOARCH=arm
DUMB_ARCH=armhf
endif
#ifeq ($(ARCH),arm64)
# QEMUARCH=aarch64
#endif
ifeq ($(ARCH),arm64)
QEMUARCH=aarch64
endif
ifeq ($(ARCH),ppc64le)
QEMUARCH=ppc64le
GOARCH=ppc64le
Expand All @@ -54,7 +54,7 @@ endif
# QEMUARCH=s390x
#endif

export TEMP_DIR ?= $(shell mktemp -d)
TEMP_DIR := $(shell mktemp -d)

DOCKERFILE := $(TEMP_DIR)/rootfs/Dockerfile

Expand Down

0 comments on commit 1b41e80

Please sign in to comment.