Skip to content

Commit

Permalink
Merge pull request #8066 from GoogleCloudPlatform/revert-8063-revert-…
Browse files Browse the repository at this point in the history
…7927-docker_16_broken

Revert "Revert "release build broken on Docker 1.6""
  • Loading branch information
zmerlynn committed May 11, 2015
2 parents 2dbe659 + 4122b20 commit 3b540bf
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion build/build-image/Dockerfile
Expand Up @@ -22,8 +22,12 @@ ENV GOARM 5
ENV GOOS linux
ENV GOARCH amd64

# work around 64MB tmpfs size in Docker 1.6
ENV TMPDIR /tmp.k8s

# Get the code coverage tool and godep
RUN go get golang.org/x/tools/cmd/cover github.com/tools/godep
RUN mkdir $TMPDIR && \
go get golang.org/x/tools/cmd/cover github.com/tools/godep

# We use rsync to copy some binaries around. It is faster (0.3s vs. 1.1s) on my
# machine vs. `install`
Expand Down

0 comments on commit 3b540bf

Please sign in to comment.