Merge pull request #1013 from contiv/master

Merge master into release-1.1

Author: dseevr

.dockerignore

@@ -0,0 +1,8 @@
+# we want to get the git commit SHA but not all the binary repo data
+.git/objects/pack
+bin/
+vagrant/
+docs/
+scripts/gobgp
+*.tar
+*.bz2

.github/CONTRIBUTING.md

@@ -0,0 +1 @@
+Please refer to Contiv [community contribution guidelines](http://contiv.github.io/documents/community/CONTRIBUTING.html).

CONTRIBUTING.md

@@ -28,14 +28,27 @@ FROM golang:1.7.6
 #ENV https_proxy ""
 ARG http_proxy
 ARG https_proxy
-ENV GOPATH=/go/ NET_CONTAINER_BUILD=1
+
+WORKDIR /go/src/github.com/contiv/netplugin/
 
 ENTRYPOINT ["netplugin"]
 CMD ["--help"]
 
-COPY ./ /go/src/github.com/contiv/netplugin/
+# by far, most of the compilation time is building vendor packages
+# build the vendor dependencies as a separate docker caching layer
+COPY ./vendor/ /go/src/github.com/contiv/netplugin/vendor/
 
-WORKDIR /go/src/github.com/contiv/netplugin/
+RUN GOGC=1500 go install -ldflags "-s -w" $(go list ./vendor/...)
+
+# build the netplugin binaries
+COPY ./ /go/src/github.com/contiv/netplugin/
 
-RUN make build
+ARG BUILD_VERSION=""
+ARG NIGHTLY_RELEASE=""
 
+RUN GOPATH=/go/ \
+    BUILD_VERSION="${BUILD_VERSION}" \
+    NIGHTLY_RELEASE="${NIGHTLY_RELEASE}" \
+    make compile \
+      && cp scripts/contrib/completion/bash/netctl /etc/bash_completion.d/netctl \
+      && netplugin -version

Dockerfile

@@ -0,0 +1 @@
+Please refer to Contiv [community governance guidelines](http://contiv.github.io/documents/community/GOVERNANCE.html).