kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-06 17:57:51 +00:00
Code Issues Projects Releases Packages Activity Actions

Merge pull request #70 from linux-on-ibm-z/k8s-prom-adapter-s390x

Browse source 
Update Makefile to support s390x
This commit is contained in:
Solly Ross 2018-05-25 14:21:48 -04:00 • committed by GitHub
commit 92930ec2d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -8,6 +8,7 @@ OUT_DIR?=./_output
VENDOR_DOCKERIZED=0 VENDOR_DOCKERIZED=0
VERSION?=latest VERSION?=latest
GOIMAGE=golang:1.8
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=busybox BASEIMAGE?=busybox
@ -23,6 +24,7 @@ ifeq ($(ARCH),ppc64le)
endif endif
ifeq ($(ARCH),s390x) ifeq ($(ARCH),s390x)
BASEIMAGE?=s390x/busybox BASEIMAGE?=s390x/busybox
GOIMAGE=s390x/golang:1.8
endif endif
.PHONY: all build docker-build push-% push test verify-gofmt gofmt verify .PHONY: all build docker-build push-% push test verify-gofmt gofmt verify
@ -35,7 +37,7 @@ docker-build: vendor
cp deploy/Dockerfile $(TEMP_DIR) cp deploy/Dockerfile $(TEMP_DIR)
cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
docker run -it -v $(TEMP_DIR):/build -v $(shell pwd):/go/src/github.com/directxman12/k8s-prometheus-adapter -e GOARCH=$(ARCH) golang:1.8 /bin/bash -c "\ docker run -it -v $(TEMP_DIR):/build -v $(shell pwd):/go/src/github.com/directxman12/k8s-prometheus-adapter -e GOARCH=$(ARCH) $(GOIMAGE) /bin/bash -c "\
CGO_ENABLED=0 go build -a -tags netgo -o /build/adapter github.com/directxman12/k8s-prometheus-adapter/cmd/adapter" CGO_ENABLED=0 go build -a -tags netgo -o /build/adapter github.com/directxman12/k8s-prometheus-adapter/cmd/adapter"
docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR) docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)