github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7927 from smarterclayton/docker_16_broken

Browse Source 
release build broken on Docker 1.6
This commit is contained in:
Zach Loafman
2015-05-11 09:36:38 -07:00
parent 63b821aeb6 6a86c48207
commit e024a72eae
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/build-image/Dockerfile
View File

@@ -22,8 +22,12 @@ ENV GOARM 5
ENV GOOS linux ENV GOOS linux
ENV GOARCH amd64 ENV GOARCH amd64
# 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 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 # We use rsync to copy some binaries around. It is faster (0.3s vs. 1.1s) on my
# machine vs. `install` # machine vs. `install`