Merge pull request #28819 from thockin/cross-goimport

Automatic merge from submit-queue WIP: Add goimports to the cross build A couple of verifiers have their own Dockerfiles because this doesn't have goimports (the protobuf one and the new runtime one)

Merge pull request #28819 from thockin/cross-goimport
23eee2d7 · Kubernetes Submit Queue · GitHub · 4d70d9f3 · 3b1407af · 23eee2d7
Commit 23eee2d7 authored Aug 06, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

Dockerfile build/build-image/cross/Dockerfile +4 -1

VERSION build/build-image/cross/VERSION +1 -1

common.sh build/common.sh +1 -1

No files found.
--- a/build/build-image/cross/Dockerfile
+++ b/build/build-image/cross/Dockerfile
@@ -66,7 +66,10 @@ ENV TMPDIR /tmp.k8s
 RUN mkdir $TMPDIR \
  && chmod a+rwx $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.
 RUN export ETCD_VERSION=v2.2.1; \

--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
-v1.6.3-1
+v1.6.3-2
--- a/build/common.sh
+++ b/build/common.sh
@@ -45,7 +45,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"

 # Constants
 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>"

 # Here we map the output directories across both the local and remote _output