Merge pull request #1044 from contiv/master

Merge master into release-1.1

Author: dseevr

.dockerignore

@@ -1,8 +1,12 @@
 # we want to get the git commit SHA but not all the binary repo data
 .git/objects/pack
 bin/
+.vagrant
 vagrant/
 docs/
 scripts/gobgp
 *.tar
 *.bz2
+# export from a docker container, no need to copy into any docker containers
+install/v2plugin/rootfs
+vagrant/k8s/export/netctl

.gitignore

@@ -2,6 +2,7 @@
 *.o
 *.a
 *.so
+*.bz2
 
 # Folders
 _obj

Dockerfile

@@ -14,15 +14,15 @@
 ##
 
 ##
-# Container image for netplugin
+# Container image for compiled netplugin binaries
 #
 # Run netplugin:
 # docker run --net=host <image> -host-label=<label>
 ##
 
 FROM golang:1.7.6
 
-# Insert your proxy server settings if this build is running behind 
+# Insert your proxy server settings if this build is running behind
 # a proxy.
 #ENV http_proxy ""
 #ENV https_proxy ""

Dockerfile-check

@@ -0,0 +1,10 @@
+FROM golang:1.7.6
+
+ENV GOPATH=/go
+
+WORKDIR /go/src/github.com/contiv/netplugin/
+
+RUN go get github.com/golang/lint/golint \
+           github.com/client9/misspell/cmd/misspell
+
+CMD ["make", "checks"]