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
a735e2d1
Commit
a735e2d1
authored
Jan 21, 2015
by
Joe Beda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch official builds to go 1.4.
This fixes #2894
parent
903de0c2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Dockerfile
build/build-image/Dockerfile
+1
-1
Dockerfile
build/build-image/cross/Dockerfile
+1
-1
common.sh
build/common.sh
+2
-2
No files found.
build/build-image/Dockerfile
View file @
a735e2d1
...
...
@@ -23,7 +23,7 @@ ENV GOOS linux
ENV
GOARCH amd64
# Get the code coverage tool and godep
RUN
go get
code.google.com/p/go.
tools/cmd/cover github.com/tools/godep
RUN
go get
golang.org/x/
tools/cmd/cover github.com/tools/godep
# We use rsync to copy some binaries around. It is faster (0.3s vs. 1.1s) on my
# machine vs. `install`
...
...
build/build-image/cross/Dockerfile
View file @
a735e2d1
...
...
@@ -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.
3
FROM
golang:1.
4
MAINTAINER
Joe Beda <jbeda@google.com>
ENV
KUBE_CROSSPLATFORMS \
...
...
build/common.sh
View file @
a735e2d1
...
...
@@ -51,7 +51,7 @@ readonly KUBE_BUILD_IMAGE_REPO=kube-build
# KUBE_BUILD_CONTAINER_NAME=kube-build-<hash>
readonly
KUBE_BUILD_IMAGE_CROSS_TAG
=
cross
readonly
KUBE_BUILD_IMAGE_CROSS
=
"
${
KUBE_BUILD_IMAGE_REPO
}
:
${
KUBE_BUILD_IMAGE_CROSS_TAG
}
"
readonly
KUBE_BUILD_GOLANG_VERSION
=
1.
3
readonly
KUBE_BUILD_GOLANG_VERSION
=
1.
4
# KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>
# Here we map the output directories across both the local and remote _output
...
...
@@ -261,7 +261,7 @@ function kube::build::build_image_built() {
}
function
kube::build::ensure_golang
()
{
kube::build::docker_image_exists golang
1.3
||
{
kube::build::docker_image_exists golang
"
${
KUBE_BUILD_GOLANG_VERSION
}
"
||
{
[[
${
KUBE_SKIP_CONFIRMATIONS
}
=
~ ^[yY]
$
]]
||
{
echo
"You don't have a local copy of the golang docker image. This image is 450MB."
read
-p
"Download it now? [y/n] "
-r
...
...
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