AUTH-2860: Fix builds

This commit is contained in:
Michael Borkenstein 2020-06-30 14:46:05 -05:00
parent 2a3d486126
commit 7724ff8176
3 changed files with 5 additions and 2 deletions

View File

@ -2,7 +2,7 @@ images:
- name: cloudflared - name: cloudflared
dockerfile: Dockerfile dockerfile: Dockerfile
context: . context: .
verions: versions:
- latest - latest
registries: registries:
- name: docker.io/cloudflare - name: docker.io/cloudflare

View File

@ -17,7 +17,9 @@ ifeq ($(EQUINOX_IS_DRAFT), true)
endif endif
LOCAL_ARCH ?= $(shell uname -m) LOCAL_ARCH ?= $(shell uname -m)
ifeq ($(LOCAL_ARCH),x86_64) ifneq ($(GOARCH),)
TARGET_ARCH ?= $(GOARCH)
else ifeq ($(LOCAL_ARCH),x86_64)
TARGET_ARCH ?= amd64 TARGET_ARCH ?= amd64
else ifeq ($(shell echo $(LOCAL_ARCH) | head -c 5),armv8) else ifeq ($(shell echo $(LOCAL_ARCH) | head -c 5),armv8)
TARGET_ARCH ?= arm64 TARGET_ARCH ?= arm64

View File

@ -29,6 +29,7 @@ stretch: &stretch
- build-essential - build-essential
- fakeroot - fakeroot
- rubygem-fpm - rubygem-fpm
- openssh-client
post-cache: post-cache:
- export GOOS=linux - export GOOS=linux
- export GOARCH=amd64 - export GOARCH=amd64