From b03784934d02258a5f895fd9a0d2d04f44285b06 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Tue, 2 Aug 2016 14:50:02 -0700 Subject: [PATCH] Add go-bindata to the cross-build image --- build/build-image/cross/Dockerfile | 4 ++-- build/build-image/cross/VERSION | 2 +- build/common.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index 379d80a1073..248ea8347f2 100644 --- a/build/build-image/cross/Dockerfile +++ b/build/build-image/cross/Dockerfile @@ -62,11 +62,11 @@ RUN echo "deb http://emdebian.org/tools/debian/ jessie main" > /etc/apt/sources. # work around 64MB tmpfs size in Docker 1.6 ENV TMPDIR /tmp.k8s -# Get the code coverage tool and godep +# Get the code coverage tool, godep, and go-bindata RUN mkdir $TMPDIR \ && chmod a+rwx $TMPDIR \ && chmod o+t $TMPDIR \ - && go get golang.org/x/tools/cmd/cover github.com/tools/godep + && go get golang.org/x/tools/cmd/cover 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 0400c13c4e3..80d7c7cbdfe 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.6.3-0 +v1.6.3-1 diff --git a/build/common.sh b/build/common.sh index b70bf1b6d8d..91a8b3de5ef 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-0" +readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.3-1" # KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-" # Here we map the output directories across both the local and remote _output