Skip to content

Commit a8fbcbf

Browse files
andyxningbrancz
authored andcommitted
use golang image to compile ksm
1 parent 04043aa commit a8fbcbf

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ sudo: required
22

33
language: go
44

5-
go:
6-
- "1.10"
7-
85
install:
96
- mkdir -p $HOME/gopath/src/k8s.io
107
- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/kube-state-metrics

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
FLAGS =
2-
BUILDENVVAR = CGO_ENABLED=0
32
TESTENVVAR =
43
REGISTRY = quay.io/coreos
54
TAG = $(shell git describe --abbrev=0)
@@ -9,6 +8,7 @@ BuildDate = $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
98
Commit = $(shell git rev-parse --short HEAD)
109
ALL_ARCH = amd64 arm arm64 ppc64le s390x
1110
PKG=k8s.io/kube-state-metrics
11+
GO_VERSION=1.10.1
1212

1313
IMAGE = $(REGISTRY)/kube-state-metrics
1414
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
@@ -28,7 +28,7 @@ doccheck:
2828
@echo OK
2929

3030
build: clean
31-
GOOS=$(shell uname -s | tr A-Z a-z) GOARCH=$(ARCH) $(BUILDENVVAR) go build -ldflags "-s -w -X ${PKG}/version.Release=${TAG} -X ${PKG}/version.Commit=${Commit} -X ${PKG}/version.BuildDate=${BuildDate}" -o kube-state-metrics
31+
docker run --rm -v "$$PWD":/go/src/k8s.io/kube-state-metrics -w /go/src/k8s.io/kube-state-metrics -e GOOS=$(shell uname -s | tr A-Z a-z) -e GOARCH=$(ARCH) -e CGO_ENABLED=0 golang:${GO_VERSION} go build -ldflags "-s -w -X ${PKG}/version.Release=${TAG} -X ${PKG}/version.Commit=${Commit} -X ${PKG}/version.BuildDate=${BuildDate}" -o kube-state-metrics
3232

3333
test-unit: clean build
3434
GOOS=$(shell uname -s | tr A-Z a-z) GOARCH=$(ARCH) $(TESTENVVAR) go test --race $(FLAGS) $(PKGS)
@@ -49,8 +49,8 @@ all-push: $(addprefix sub-push-,$(ALL_ARCH))
4949

5050
container: .container-$(ARCH)
5151
.container-$(ARCH):
52+
docker run --rm -v "$$PWD":/go/src/k8s.io/kube-state-metrics -w /go/src/k8s.io/kube-state-metrics -e GOOS=linux -e GOARCH=$(ARCH) -e CGO_ENABLED=0 golang:${GO_VERSION} go build -ldflags "-s -w -X ${PKG}/version.Release=${TAG} -X ${PKG}/version.Commit=${Commit} -X ${PKG}/version.BuildDate=${BuildDate}" -o kube-state-metrics
5253
cp -r * $(TEMP_DIR)
53-
GOOS=linux GOARCH=$(ARCH) $(BUILDENVVAR) go build -o $(TEMP_DIR)/kube-state-metrics
5454
docker build -t $(MULTI_ARCH_IMG):$(TAG) $(TEMP_DIR)
5555

5656
ifeq ($(ARCH), amd64)

0 commit comments

Comments
 (0)