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
a333cf42
Commit
a333cf42
authored
Jul 18, 2016
by
Jess Frazelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update go to 1.6.3
Signed-off-by:
Jess Frazelle
<
me@jessfraz.com
>
parent
f50bb73e
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
8 deletions
+8
-8
Dockerfile
build/build-image/cross/Dockerfile
+1
-1
VERSION
build/build-image/cross/VERSION
+1
-1
common.sh
build/common.sh
+2
-2
dockerized-e2e-runner.sh
hack/jenkins/dockerized-e2e-runner.sh
+1
-1
gotest-dockerized.sh
hack/jenkins/gotest-dockerized.sh
+1
-1
Dockerfile
hack/jenkins/test-image/Dockerfile
+1
-1
Makefile
hack/jenkins/test-image/Makefile
+1
-1
No files found.
build/build-image/cross/Dockerfile
View file @
a333cf42
...
@@ -15,7 +15,7 @@
...
@@ -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.6.
2
FROM
golang:1.6.
3
ENV
GOARM 6
ENV
GOARM 6
ENV
KUBE_DYNAMIC_CROSSPLATFORMS \
ENV
KUBE_DYNAMIC_CROSSPLATFORMS \
...
...
build/build-image/cross/VERSION
View file @
a333cf42
v1.6.
2-2
v1.6.
3-0
build/common.sh
View file @
a333cf42
...
@@ -45,7 +45,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"
...
@@ -45,7 +45,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"
# Constants
# Constants
readonly
KUBE_BUILD_IMAGE_REPO
=
kube-build
readonly
KUBE_BUILD_IMAGE_REPO
=
kube-build
readonly
KUBE_BUILD_IMAGE_CROSS_TAG
=
"v1.6.
2-2
"
readonly
KUBE_BUILD_IMAGE_CROSS_TAG
=
"v1.6.
3-0
"
# KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"
# KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"
# Here we map the output directories across both the local and remote _output
# Here we map the output directories across both the local and remote _output
...
@@ -173,7 +173,7 @@ function kube::build::docker_available_on_osx() {
...
@@ -173,7 +173,7 @@ function kube::build::docker_available_on_osx() {
kube::log::status
"Using Docker for MacOS"
kube::log::status
"Using Docker for MacOS"
return
0
return
0
fi
fi
kube::log::status
"No docker host is set. Checking options for setting one..."
kube::log::status
"No docker host is set. Checking options for setting one..."
if
[[
-z
"
$(
which docker-machine
)
"
&&
-z
"
$(
which boot2docker
)
"
]]
;
then
if
[[
-z
"
$(
which docker-machine
)
"
&&
-z
"
$(
which boot2docker
)
"
]]
;
then
kube::log::status
"It looks like you're running Mac OS X, yet none of Docker for Mac, docker-machine or boot2docker are on the path."
kube::log::status
"It looks like you're running Mac OS X, yet none of Docker for Mac, docker-machine or boot2docker are on the path."
...
...
hack/jenkins/dockerized-e2e-runner.sh
View file @
a333cf42
...
@@ -61,5 +61,5 @@ docker run --rm=true -i \
...
@@ -61,5 +61,5 @@ docker run --rm=true -i \
-e
"WORKSPACE=/workspace"
\
-e
"WORKSPACE=/workspace"
\
${
KUBEKINS_SERVICE_ACCOUNT_FILE
:+-e
"KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"
}
\
${
KUBEKINS_SERVICE_ACCOUNT_FILE
:+-e
"KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"
}
\
"
${
docker_extra_args
[@]
:+
${
docker_extra_args
[@]
}}
"
\
"
${
docker_extra_args
[@]
:+
${
docker_extra_args
[@]
}}
"
\
gcr.io/google_containers/kubekins-test:go1.6.
2-docker1.9.1-rev3
\
gcr.io/google_containers/kubekins-test:go1.6.
3-docker1.9.1-rev1
\
bash
-c
"bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"
bash
-c
"bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"
hack/jenkins/gotest-dockerized.sh
View file @
a333cf42
...
@@ -44,5 +44,5 @@ docker run --rm=true \
...
@@ -44,5 +44,5 @@ docker run --rm=true \
-e
"KUBE_VERIFY_GIT_BRANCH=
${
KUBE_VERIFY_GIT_BRANCH
:-}
"
\
-e
"KUBE_VERIFY_GIT_BRANCH=
${
KUBE_VERIFY_GIT_BRANCH
:-}
"
\
-e
"REPO_DIR=
${
REPO_DIR
}
"
\
-e
"REPO_DIR=
${
REPO_DIR
}
"
\
-e
"HOST_ARTIFACTS_DIR=
${
HOST_ARTIFACTS_DIR
}
"
\
-e
"HOST_ARTIFACTS_DIR=
${
HOST_ARTIFACTS_DIR
}
"
\
-i
gcr.io/google_containers/kubekins-test:go1.6.
2-docker1.9.1-rev3
\
-i
gcr.io/google_containers/kubekins-test:go1.6.
3-docker1.9.1-rev1
\
bash
-c
"cd kubernetes &&
${
KUBE_TEST_SCRIPT
:-
./hack/jenkins/test-dockerized.sh
}
"
bash
-c
"cd kubernetes &&
${
KUBE_TEST_SCRIPT
:-
./hack/jenkins/test-dockerized.sh
}
"
hack/jenkins/test-image/Dockerfile
View file @
a333cf42
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
# This file creates a build environment for building and running kubernetes
# This file creates a build environment for building and running kubernetes
# unit and integration tests
# unit and integration tests
FROM
golang:1.6.
2
FROM
golang:1.6.
3
MAINTAINER
Jeff Lowdermilk <jeffml@google.com>
MAINTAINER
Jeff Lowdermilk <jeffml@google.com>
ENV
WORKSPACE /workspace
ENV
WORKSPACE /workspace
...
...
hack/jenkins/test-image/Makefile
View file @
a333cf42
...
@@ -16,7 +16,7 @@ all: push
...
@@ -16,7 +16,7 @@ all: push
# Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
# Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
# These versions are specified in the Dockerfile
# These versions are specified in the Dockerfile
TAG
=
go1.6.
2-docker1.9.1-rev3
TAG
=
go1.6.
3-docker1.9.1-rev1
container
:
container
:
docker build
-t
gcr.io/google_containers/kubekins-test .
docker build
-t
gcr.io/google_containers/kubekins-test .
...
...
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