kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Setting versions for go and kubectl in protokube

This commit is contained in:
chrislovecnm 2017-06-24 18:35:32 -06:00
parent 8585f00717
commit 96271b05df
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -1,8 +1,5 @@
language: go language: go
go: go:
#- 1.5 go test arguments are different in 1.5 :-(
#- 1.6 issues with OSX release, and 1.7 is required now by core
- 1.7
- 1.8 - 1.8
- tip - tip

2
Makefile
View File

@ -21,7 +21,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
LATEST_FILE?=latest-ci.txt LATEST_FILE?=latest-ci.txt
GOPATH_1ST=$(shell echo ${GOPATH} | cut -d : -f 1) GOPATH_1ST=$(shell echo ${GOPATH} | cut -d : -f 1)
UNIQUE:=$(shell date +%s) UNIQUE:=$(shell date +%s)
GOVERSION=1.8.1 GOVERSION=1.8.3
# See http://stackoverflow.com/questions/18136918/how-to-get-current-relative-directory-of-your-makefile # See http://stackoverflow.com/questions/18136918/how-to-get-current-relative-directory-of-your-makefile
MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")) MAKEDIR:=$(strip $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))"))

2
images/protokube-builder/Dockerfile
View File

@ -21,7 +21,7 @@ FROM debian:jessie
RUN apt-get update && apt-get install --yes curl git gcc make RUN apt-get update && apt-get install --yes curl git gcc make
# Install golang # Install golang
RUN curl -L https://storage.googleapis.com/golang/go1.7.3.linux-amd64.tar.gz | tar zx -C /usr/local RUN curl -L https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar zx -C /usr/local
ENV PATH $PATH:/usr/local/go/bin ENV PATH $PATH:/usr/local/go/bin
COPY onbuild.sh /onbuild.sh COPY onbuild.sh /onbuild.sh

2
images/protokube-builder/onbuild.sh
View File

@ -34,5 +34,5 @@ cp /go/bin/channels /src/.build/artifacts/
# channels uses protokube # channels uses protokube
cd /src/.build/artifacts/ cd /src/.build/artifacts/
curl -O https://storage.googleapis.com/kubernetes-release/release/v1.6.1/bin/linux/amd64/kubectl curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
chmod +x kubectl chmod +x kubectl