review feedback

go-winio is now safe to include in compile
strict bash checks and fix indents getGitCommit.sh
switch docker build from USE_RELEASE to NIGHTLY_BUILD

Author: chrisplo

Dockerfile

@@ -37,21 +37,18 @@ CMD ["--help"]
 # 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/
-# there is a bug in go-winio, remote the grep -v after this merges:
-# https://github.com/contiv/netplugin/pull/999
-RUN GOGC=1500 \
-  go install -ldflags "-s -w" \
-             $(go list ./vendor/... | grep -v go-winio)
+
+RUN GOGC=1500 go install -ldflags "-s -w" $(go list ./vendor/...)
 
 # build the netplugin binaries
 COPY ./ /go/src/github.com/contiv/netplugin/
 
 ARG BUILD_VERSION=""
-ARG USE_RELEASE=""
+ARG NIGHTLY_RELEASE=""
 
 RUN GOPATH=/go/ \
     BUILD_VERSION="${BUILD_VERSION}" \
-    USE_RELEASE="${USE_RELEASE}" \
+    NIGHTLY_RELEASE="${NIGHTLY_RELEASE}" \
     make compile \
-    && cp scripts/contrib/completion/bash/netctl /etc/bash_completion.d/netctl \
-    && netplugin -version
+      && cp scripts/contrib/completion/bash/netctl /etc/bash_completion.d/netctl \
+      && netplugin -version

Makefile

@@ -97,9 +97,10 @@ compile:
 run-build: deps checks clean compile
 
 compile-with-docker:
-	docker build --build-arg USE_RELEASE=${USE_RELEASE} \
-	             --build-arg BUILD_VERSION=${BUILD_VERSION} \
-				 -t netplugin:$${BUILD_VERSION:-devBuild}-$$(./scripts/getGitCommit.sh) .
+	docker build \
+		--build-arg NIGHTLY_RELEASE=${NIGHTLY_RELEASE} \
+		--build-arg BUILD_VERSION=${BUILD_VERSION} \
+		-t netplugin:$${BUILD_VERSION:-devBuild}-$$(./scripts/getGitCommit.sh) .
 
 build-docker-image: start
 	vagrant ssh netplugin-node1 -c 'bash -lc "source /etc/profile.d/envvar.sh && cd /opt/gopath/src/github.com/contiv/netplugin && make host-build-docker-image"'

scripts/getGitCommit.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 
+set -euo pipefail
+
 if command -v git &>/dev/null && git rev-parse &>/dev/null; then
-	GIT_COMMIT=$(git rev-parse --short HEAD)
-	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
-		GIT_COMMIT="$GIT_COMMIT-unsupported"
-	fi
+    GIT_COMMIT=$(git rev-parse --short HEAD)
+    if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
+        GIT_COMMIT="$GIT_COMMIT-unsupported"
+    fi
     echo $GIT_COMMIT
     exit 0
 fi
 echo >&2 'error: unable to determine the git revision'
 exit 1
-