Merge pull request #127 from eyakubovich/master

build/dist maintenance

Dockerfile

@@ -1 +1 @@
-FROM golang:onbuild
+FROM golang:1.4.1-onbuild

dist/build-docker → dist/build-docker.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 if [ $# -ne 1 ]; then
 	echo "Usage: $0 tag" >/dev/stderr
@@ -9,6 +10,10 @@ tag=$1
 
 tgt=$(mktemp -d)
 
+# Build flannel inside 
+docker run -v `pwd`/../:/opt/flannel -i -t golang:1.4.1 /bin/bash -c "cd /opt/flannel && ./build"
+
+# Generate Dockerfile into target tmp dir
 cat <<DF >${tgt}/Dockerfile
 FROM quay.io/coreos/flannelbox:1.0
 MAINTAINER Eugene Yakubovich <[email protected]>
@@ -17,7 +22,10 @@ ADD ./mk-docker-opts.sh /opt/bin/
 CMD /opt/bin/flanneld
 DF
 
+# Copy artifcats into target dir and build the image
 cp ../bin/flanneld $tgt
-cp ../dist/mk-docker-opts.sh $tgt
+cp ./mk-docker-opts.sh $tgt
 docker build -t quay.io/coreos/flannel:${tag} $tgt
+
+# Cleanup
 rm -rf $tgt