From e42afabd03dbd0aef09340cd60cd68e8646e6ca0 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Mon, 8 Dec 2014 16:46:40 -0800
Subject: [PATCH] Build and test using Docker

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 .dockerignore | 1 +
 .gitignore    | 2 +-
 .travis.yml   | 2 +-
 Dockerfile    | 7 +++++--
 README.md     | 3 ++-
 script/build  | 4 +++-
 script/test   | 4 +++-
 7 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..288b62c015
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+machine*
diff --git a/.gitignore b/.gitignore
index 01dee70615..288b62c015 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-machine
+machine*
diff --git a/.travis.yml b/.travis.yml
index 9e921039aa..e1511f83f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,4 @@ go:
 script:
 - script/validate-dco
 - script/validate-gofmt
-- script/test
+- go test -v ./...
diff --git a/Dockerfile b/Dockerfile
index bc49367286..22cb47734d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,5 @@
-FROM golang:onbuild
-ENTRYPOINT ["machine"]
+FROM golang:1.3-cross
+RUN go get github.com/mitchellh/gox
+ENV GOPATH /go/src/github.com/docker/machine/Godeps/_workspace:/go
+WORKDIR /go/src/github.com/docker/machine
+ADD . /go/src/github.com/docker/machine
diff --git a/README.md b/README.md
index f35133d4c7..670ce0eb8c 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,8 @@ To build, run:
     $ go get github.com/docker/machine
     $ cd $GOPATH/src/github.com/docker/machine
     $ script/build
-    $ ./machine
+
+That will create binaries for various platforms in the current directory.
 
 If you have any questions we're in #docker-machine on Freenode.
 
diff --git a/script/build b/script/build
index 2dafcb3474..41e8df3a8d 100755
--- a/script/build
+++ b/script/build
@@ -1,2 +1,4 @@
 #!/bin/sh
-GOPATH=`pwd`/Godeps/_workspace:$GOPATH go build
+set -e
+docker build -t docker-machine .
+exec docker run --rm -v `pwd`:/go/src/github.com/docker/machine docker-machine gox -os="darwin linux" -parallel=5
diff --git a/script/test b/script/test
index 75b5b160b8..8f51da548b 100755
--- a/script/test
+++ b/script/test
@@ -1,2 +1,4 @@
 #!/bin/sh
-GOPATH=`pwd`/Godep/_workspace:$GOPATH go test -v ./...
+set -e
+docker build -t docker-machine .
+exec docker run --rm docker-machine go test -v ./...