From 3b1407af70ac54c925fe5abb060e83d625d77b88 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Mon, 11 Jul 2016 22:03:49 -0700 Subject: [PATCH] Add goimports to the cross build --- build/build-image/cross/Dockerfile | 5 ++++- build/build-image/cross/VERSION | 2 +- build/common.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index 248ea8347f..60461a4a3b 100644 --- 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; \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 80d7c7cbdf..4d44e38c38 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.6.3-1 +v1.6.3-2 diff --git a/build/common.sh b/build/common.sh index a2519b311f..db27a89a82 100755 --- 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-" # Here we map the output directories across both the local and remote _output