github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add goimports to the cross build

pull/6/head
Tim Hockin 2016-07-11 22:03:49 -07:00
parent 1b1607a3e6
commit 3b1407af70
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/build-image/cross/Dockerfile
View File

@ -66,7 +66,10 @@ ENV TMPDIR /tmp.k8s
RUN mkdir $TMPDIR \ RUN mkdir $TMPDIR \
&& chmod a+rwx $TMPDIR \ && chmod a+rwx $TMPDIR \
&& chmod o+t $TMPDIR \ && chmod o+t $TMPDIR \
&& go get golang.org/x/tools/cmd/cover github.com/tools/godep github.com/jteeuwen/go-bindata/go-bindata && go get golang.org/x/tools/cmd/cover \
golang.org/x/tools/cmd/goimports \
github.com/tools/godep \
github.com/jteeuwen/go-bindata/go-bindata
# Download and symlink etcd. We need this for our integration tests. # Download and symlink etcd. We need this for our integration tests.
RUN export ETCD_VERSION=v2.2.1; \ RUN export ETCD_VERSION=v2.2.1; \

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.6.3-1 v1.6.3-2

2
build/common.sh
View File

@ -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.3-1" readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat build/build-image/cross/VERSION)"
# 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