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

Merge pull request #4168 from chrislovecnm/golang-1.9 

Golang 1.9
This commit is contained in:
k8s-ci-robot 2018-01-05 11:11:12 -08:00 committed by GitHub
parent 21a372f6b2 1dc4f779a0
commit b398454b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -20,7 +20,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%)
LATEST_FILE?=latest-ci.txt LATEST_FILE?=latest-ci.txt
GOPATH_1ST=$(shell go env | grep GOPATH | cut -f 2 -d \") GOPATH_1ST=$(shell go env | grep GOPATH | cut -f 2 -d \")
UNIQUE:=$(shell date +%s) UNIQUE:=$(shell date +%s)
GOVERSION=1.8.3 GOVERSION=1.9.2
BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build BUILD=$(GOPATH_1ST)/src/k8s.io/kops/.build
LOCAL=$(BUILD)/local LOCAL=$(BUILD)/local
BINDATA_TARGETS=upup/models/bindata.go federation/model/bindata.go BINDATA_TARGETS=upup/models/bindata.go federation/model/bindata.go

2
images/dns-controller-builder/Dockerfile
View File

@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install golang # Install golang
RUN curl -L https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar zx -C /usr/local RUN curl -L https://storage.googleapis.com/golang/go1.9.2.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/Dockerfile
View File

@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Install golang # Install golang
RUN curl -L https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar zx -C /usr/local RUN curl -L https://storage.googleapis.com/golang/go1.9.2.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