mirror of https://github.com/k3s-io/k3s
Bump Go version to 1.8.3
parent
714ac7c95e
commit
3e8c27af34
|
@ -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.8.1
|
FROM golang:1.8.3
|
||||||
|
|
||||||
ENV GOARM 7
|
ENV GOARM 7
|
||||||
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
|
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
v1.8.1-2
|
v1.8.3-1
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "io_bazel_rules_go",
|
name = "io_bazel_rules_go",
|
||||||
sha256 = "a1cae429e9d591017421150e3173478c46c693bc594322c7fa7e6cb5f672ef59",
|
sha256 = "64294fd0e74d2aafa03ec3a1f2f9c167e27d17c9a5cf393e8bf79e43258de73d",
|
||||||
strip_prefix = "rules_go-805fd1566500997379806373feb05e138a4dfe28",
|
strip_prefix = "rules_go-a9df110cf04e167b33f10473c7e904d780d921e6",
|
||||||
urls = ["https://github.com/bazelbuild/rules_go/archive/805fd1566500997379806373feb05e138a4dfe28.tar.gz"],
|
urls = ["https://github.com/bazelbuild/rules_go/archive/a9df110cf04e167b33f10473c7e904d780d921e6.tar.gz"],
|
||||||
)
|
)
|
||||||
|
|
||||||
http_archive(
|
http_archive(
|
||||||
|
@ -33,7 +33,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_repositories")
|
||||||
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories")
|
load("@io_bazel_rules_docker//docker:docker.bzl", "docker_repositories")
|
||||||
|
|
||||||
go_repositories(
|
go_repositories(
|
||||||
go_version = "1.8.1",
|
go_version = "1.8.3",
|
||||||
)
|
)
|
||||||
|
|
||||||
docker_repositories()
|
docker_repositories()
|
||||||
|
|
|
@ -15,10 +15,10 @@
|
||||||
# Build the etcd-version-monitor image
|
# Build the etcd-version-monitor image
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# [GOLANG_VERSION=1.8.1] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push)
|
# [GOLANG_VERSION=1.8.3] [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.8.1
|
GOLANG_VERSION?=1.8.3
|
||||||
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)
|
||||||
|
|
|
@ -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.8.1
|
GOLANG_VERSION=1.8.3
|
||||||
|
|
||||||
BIN = serve_hostname
|
BIN = serve_hostname
|
||||||
SRCS = serve_hostname.go
|
SRCS = serve_hostname.go
|
||||||
|
|
Loading…
Reference in New Issue