Skip to content

Commit 6db42dc

Browse files
committed
Fix travis build
No need for GO in the builder - we build in docker.
1 parent 0d4bbb8 commit 6db42dc

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.travis.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
language: go
2-
install: false
3-
4-
go:
5-
- "1.10"
1+
language: minimal
62

73
before_script:
84
- wget https://storage.googleapis.com/kubernetes-helm/helm-v2.8.2-linux-amd64.tar.gz -O /tmp/helm-v2.8.2-linux-amd64.tar.gz
95
- mkdir /tmp/bin -p; tar xzf /tmp/helm-v2.8.2-linux-amd64.tar.gz -C /tmp/bin --strip-components=1
10-
- PATH=$PATH:/tmp/bin helm init --client-only
6+
- PATH=$PATH:/tmp/bin helm init --client-only
117

128

139
services:
1410
- docker
1511

16-
1712
script:
1813
- cd base-image && make
1914
- cd ../config-reloader && make build-image

config-reloader/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
# builder image
6-
FROM golang:1.9 as builder
6+
FROM golang:1.10 as builder
77

88
WORKDIR /go/src/github.com/vmware/kube-fluentd-operator/config-reloader
99
RUN go get -u github.com/golang/dep/cmd/dep

log-router/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ HELM_PACKAGE := log-router
77
-include vmware.mk
88

99
helm-package: clean
10+
helm lint .
1011
helm package .
1112

1213
helm-dry-run:

0 commit comments

Comments
 (0)