mirror of https://github.com/k3s-io/k3s
bump golang to 1.11.3 (CVE-2018-16875)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>pull/58/head
parent
598a01989d
commit
e17978067b
|
@ -15,7 +15,7 @@
|
|||
# This file creates a standard build environment for building cross
|
||||
# platform go binary for the architecture kubernetes cares about.
|
||||
|
||||
FROM golang:1.11.2
|
||||
FROM golang:1.11.3
|
||||
|
||||
ENV GOARM 7
|
||||
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
|
||||
|
@ -44,7 +44,7 @@ RUN apt-get update \
|
|||
# Use dynamic cgo linking for architectures other than amd64 for the server platforms
|
||||
# To install crossbuild essential for other architectures add the following repository.
|
||||
RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main universe" > /etc/apt/sources.list.d/cgocrosscompiling.list \
|
||||
&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 3B4FE6ACC0B21F32 \
|
||||
&& apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 40976EAF437D05B5 3B4FE6ACC0B21F32 \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y build-essential \
|
||||
&& for platform in ${KUBE_DYNAMIC_CROSSPLATFORMS}; do apt-get install -y crossbuild-essential-${platform}; done \
|
||||
|
|
|
@ -1 +1 @@
|
|||
v1.11.2-1
|
||||
v1.11.3-1
|
||||
|
|
|
@ -4,8 +4,8 @@ load("//build:workspace.bzl", "CRI_TOOLS_VERSION")
|
|||
|
||||
http_archive(
|
||||
name = "io_bazel_rules_go",
|
||||
sha256 = "f87fa87475ea107b3c69196f39c82b7bbf58fe27c62a338684c20ca17d1d8613",
|
||||
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.16.2/rules_go-0.16.2.tar.gz"),
|
||||
sha256 = "62ec3496a00445889a843062de9930c228b770218c735eca89c67949cd967c3f",
|
||||
urls = mirror("https://github.com/bazelbuild/rules_go/releases/download/0.16.4/rules_go-0.16.4.tar.gz"),
|
||||
)
|
||||
|
||||
http_archive(
|
||||
|
@ -49,7 +49,7 @@ load("@io_bazel_rules_docker//docker:docker.bzl", "docker_pull", "docker_reposit
|
|||
go_rules_dependencies()
|
||||
|
||||
go_register_toolchains(
|
||||
go_version = "1.11.2",
|
||||
go_version = "1.11.3",
|
||||
)
|
||||
|
||||
docker_repositories()
|
||||
|
|
|
@ -17,7 +17,7 @@ include ../../hack/make-rules/Makefile.manifest
|
|||
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
|
||||
GOARM=7
|
||||
QEMUVERSION=v2.9.1
|
||||
GOLANG_VERSION=1.11.2
|
||||
GOLANG_VERSION=1.11.3
|
||||
export
|
||||
|
||||
ifndef WHAT
|
||||
|
|
Loading…
Reference in New Issue