squash merge from dev branch

2017-09-04 22:52:14 -04:00
parent 123cd935a3
commit ed916703c6
1058 changed files with 311598 additions and 3 deletions
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+set -x
+
+DIR=`pwd`
+NAME=`basename ${DIR}`
+SHA=`git rev-parse --short HEAD`
+VERSION=${VERSION:-$SHA}
+
+GOOS=linux GOARCH=amd64 go build .
+
+docker build -t nshttpd/${NAME}:${VERSION} .
+docker push nshttpd/${NAME}:${VERSION}
+
+rm mikrotik-exporter