github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump golang versions to 1.7.5

pull/6/head
Christoph Blecker 2017-02-21 13:02:16 -08:00
parent 6a65964d0e
commit c3de31c8d0
No known key found for this signature in database
GPG Key ID: B34A59A9D39F838B
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/Dockerfile
View File

@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross # This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about. # platform go binary for the architecture kubernetes cares about.
FROM golang:1.7.4 FROM golang:1.7.5
ENV GOARM 7 ENV GOARM 7
ENV KUBE_DYNAMIC_CROSSPLATFORMS \ ENV KUBE_DYNAMIC_CROSSPLATFORMS \

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.7.4-2 v1.7.5-1

2
build/cni/Makefile
View File

@ -22,7 +22,7 @@ CNI_RELEASE?=07a8a28637e97b22eb8dfe710eeae1344f69d16e
CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz CNI_TARBALL=cni-$(ARCH)-$(CNI_RELEASE).tar.gz
CUR_DIR=$(shell pwd) CUR_DIR=$(shell pwd)
OUTPUT_DIR=$(CUR_DIR)/output OUTPUT_DIR=$(CUR_DIR)/output
GOLANG_VERSION=1.7.4 GOLANG_VERSION=1.7.5
all: build all: build

4
cluster/images/etcd-version-monitor/Makefile
View File

@ -15,10 +15,10 @@
# Build the etcd-version-monitor image # Build the etcd-version-monitor image
# #
# Usage: # Usage:
# [GOLANG_VERSION=1.7.4] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push) # [GOLANG_VERSION=1.7.5] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push)
# TODO(shyamjvs): Support architectures other than amd64 if needed. # TODO(shyamjvs): Support architectures other than amd64 if needed.
ARCH:=amd64 ARCH:=amd64
GOLANG_VERSION?=1.7.4 GOLANG_VERSION?=1.7.5
REGISTRY?=gcr.io/google-containers REGISTRY?=gcr.io/google-containers
TAG?=0.1.0 TAG?=0.1.0
IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG) IMAGE:=$(REGISTRY)/etcd-version-monitor:$(TAG)

2
cluster/images/etcd/Makefile
View File

@ -30,7 +30,7 @@ TAGS?=2.2.1 2.3.7 3.0.14
REGISTRY_TAG?=3.0.14 REGISTRY_TAG?=3.0.14
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
GOLANG_VERSION?=1.7.4 GOLANG_VERSION?=1.7.5
GOARM=7 GOARM=7
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)

2
test/images/serve_hostname/Makefile
View File

@ -31,7 +31,7 @@ ALL_ARCH = amd64 arm arm64 ppc64le s390x
GOARM=7 GOARM=7
TEMP_DIR := $(shell mktemp -d) TEMP_DIR := $(shell mktemp -d)
GOLANG_VERSION=1.7.4 GOLANG_VERSION=1.7.5
BIN = serve_hostname BIN = serve_hostname
SRCS = serve_hostname.go SRCS = serve_hostname.go