diff --git a/build/build-image/cross/Dockerfile b/build/build-image/cross/Dockerfile index d3ec13ebf7e..6b7db4fc10d 100644 --- a/build/build-image/cross/Dockerfile +++ b/build/build-image/cross/Dockerfile @@ -37,7 +37,7 @@ RUN for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${plat # Install g++, then download and install protoc for generating protobuf output RUN apt-get update \ - && apt-get install -y g++ rsync apt-utils file patch \ + && apt-get install -y g++ rsync jq apt-utils file patch \ && apt-get clean && rm -rf /var/lib/apt/lists/* RUN mkdir -p /usr/local/src/protobuf \ @@ -62,14 +62,13 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main universe" > /etc/apt/ # work around 64MB tmpfs size in Docker 1.6 ENV TMPDIR /tmp.k8s - -# Get the code coverage tool, goimports, and godep RUN mkdir $TMPDIR \ && chmod a+rwx $TMPDIR \ - && chmod o+t $TMPDIR \ - && go get golang.org/x/tools/cmd/cover \ - golang.org/x/tools/cmd/goimports \ - github.com/tools/godep + && chmod o+t $TMPDIR + +# Get the code coverage tool and goimports +RUN go get golang.org/x/tools/cmd/cover \ + golang.org/x/tools/cmd/goimports # Download and symlink etcd. We need this for our integration tests. RUN export ETCD_VERSION=v3.0.17; \ diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 490e779dc9b..25308d3ee1e 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.8.3-1 +v1.8.3-2