Merge pull request #16 from KoanHealth/master

progrium · progrium · commit 862f94acfb7b · 2014-08-28T10:51:53.000-05:00
Commit logspout binary to repository; update Dockerfile reference and Ma...
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM flynn/busybox
 MAINTAINER Jeff Lindsay <progrium@gmail.com>
 
-ADD ./build/logspout /bin/logspout
+ADD ./stage/logspout /bin/logspout
 
 ENV DOCKER unix:///tmp/docker.sock
 ENV ROUTESPATH /mnt/routes
diff --git a/Makefile b/Makefile
@@ -1,9 +1,13 @@
-build/container: build/logspout Dockerfile
+build/container: stage/logspout Dockerfile
 	docker build --no-cache -t logspout .
 	touch build/container
 
 build/logspout: *.go
-	go build -o build/logspout
+	GOOS=linux GOARCH=amd64 go build -o build/logspout
+
+stage/logspout: build/logspout
+	mkdir -p stage
+	cp build/logspout stage/logspout
 
 release:
 	docker tag logspout progrium/logspout
diff --git a/stage/logspout b/stage/logspout
