Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
15138773
Unverified
Commit
15138773
authored
Dec 14, 2018
by
Kubernetes Prow Robot
Committed by
GitHub
Dec 14, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #72035 from seemethere/bump_1_11_3
Bump golang to 1.11.3 (CVE-2018-16875)
parents
2791fb7d
d443402f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
Dockerfile
build/build-image/cross/Dockerfile
+2
-2
VERSION
build/build-image/cross/VERSION
+1
-1
WORKSPACE
build/root/WORKSPACE
+3
-3
Makefile
test/images/Makefile
+1
-1
No files found.
build/build-image/cross/Dockerfile
View file @
15138773
...
...
@@ -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
\
...
...
build/build-image/cross/VERSION
View file @
15138773
v1.11.
2
-1
v1.11.
3
-1
build/root/WORKSPACE
View file @
15138773
...
...
@@ -4,8 +4,8 @@ load("//build:workspace.bzl", "CNI_VERSION", "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()
...
...
test/images/Makefile
View file @
15138773
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment