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
fb02b33e
Commit
fb02b33e
authored
Aug 05, 2015
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix build
parent
17defc73
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
Dockerfile
build/build-image/Dockerfile
+2
-2
golang.sh
hack/lib/golang.sh
+1
-1
shippable.yml
shippable.yml
+1
-0
No files found.
build/build-image/Dockerfile
View file @
fb02b33e
...
@@ -44,7 +44,7 @@ RUN mkdir -p /usr/local/src/etcd &&\
...
@@ -44,7 +44,7 @@ RUN mkdir -p /usr/local/src/etcd &&\
# Mark this as a kube-build container
# Mark this as a kube-build container
RUN
touch
/kube-build-image
RUN
touch
/kube-build-image
WORKDIR
/go/src/
github.com/GoogleCloudPlatform
/kubernetes
WORKDIR
/go/src/
k8s.io
/kubernetes
# Propagate the git tree version into the build image
# Propagate the git tree version into the build image
ADD
kube-version-defs /kube-version-defs
ADD
kube-version-defs /kube-version-defs
...
@@ -54,4 +54,4 @@ ENV KUBE_GIT_VERSION_FILE /kube-version-defs
...
@@ -54,4 +54,4 @@ ENV KUBE_GIT_VERSION_FILE /kube-version-defs
ENV
KUBE_OUTPUT_SUBPATH _output/dockerized
ENV
KUBE_OUTPUT_SUBPATH _output/dockerized
# Upload Kubernetes source
# Upload Kubernetes source
ADD
kube-source.tar.gz /go/src/
github.com/GoogleCloudPlatform
/kubernetes
ADD
kube-source.tar.gz /go/src/
k8s.io
/kubernetes
hack/lib/golang.sh
100644 → 100755
View file @
fb02b33e
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
# limitations under the License.
# limitations under the License.
# The golang package that we are building.
# The golang package that we are building.
readonly
KUBE_GO_PACKAGE
=
github.com/GoogleCloudPlatform
/kubernetes
readonly
KUBE_GO_PACKAGE
=
k8s.io
/kubernetes
readonly
KUBE_GOPATH
=
"
${
KUBE_OUTPUT
}
/go"
readonly
KUBE_GOPATH
=
"
${
KUBE_OUTPUT
}
/go"
# Load contrib target functions
# Load contrib target functions
...
...
shippable.yml
View file @
fb02b33e
...
@@ -17,6 +17,7 @@ before_install:
...
@@ -17,6 +17,7 @@ before_install:
-
if [[ $SHIPPABLE_GO_VERSION == *release* ]]; then gvm install release; gvm use release; fi
-
if [[ $SHIPPABLE_GO_VERSION == *release* ]]; then gvm install release; gvm use release; fi
-
if [[ $SHIPPABLE_GO_VERSION =~ [0-9].[0-9] ]]; then gvm install go$SHIPPABLE_GO_VERSION; gvm use go$SHIPPABLE_GO_VERSION; fi
-
if [[ $SHIPPABLE_GO_VERSION =~ [0-9].[0-9] ]]; then gvm install go$SHIPPABLE_GO_VERSION; gvm use go$SHIPPABLE_GO_VERSION; fi
-
export GOPATH=$SHIPPABLE_GOPATH
-
export GOPATH=$SHIPPABLE_GOPATH
-
mkdir -p /root/workspace/src/k8s.io; mv /root/workspace/src/github.com/GoogleCloudPlatform/kubernetes /root/workspace/src/k8s.io/kubernetes
install
:
install
:
-
go get golang.org/x/tools/cmd/cover
-
go get golang.org/x/tools/cmd/cover
...
...
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