Skip to content

Commit

Permalink
Merge pull request moby#1035 from aboch/ci
Browse files Browse the repository at this point in the history
Fix CI
  • Loading branch information
mavenugo committed Mar 18, 2016
2 parents 6dd3351 + ae99bd0 commit b89fd5a
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
FROM golang:1.4-cross
FROM golang:1.5.3
RUN apt-get update && apt-get -y install iptables

RUN cd /go/src && mkdir -p golang.org/x && \
cd golang.org/x && git clone https://github.com/golang/tools && \
cd tools && git checkout release-branch.go1.5

RUN go get github.com/tools/godep \
github.com/golang/lint/golint \
golang.org/x/tools/cmd/vet \
Expand Down

0 comments on commit b89fd5a

Please sign in to comment.