Fix to get version from git version

DOCKER/build.sh

@@ -1,20 +1,15 @@
 #!/usr/bin/env bash
 set -e
 
-# Get the tag from the version, or try to figure it out.
-if [ -z "$TAG" ]; then
-	TAG=$(awk -F\" '/Version =/ { print $2; exit }' < ../version/version.go)
-fi
-if [ -z "$TAG" ]; then
-		echo "Please specify a tag."
-		exit 1
-fi
+# Get the git commit
+VERSION=$(git describe --always)
+echo "==> Building version $VERSION..."
 
-TAG_NO_PATCH=${TAG%.*}
+VERSION_NO_PATCH=${VERSION%.*}
 
-read -p "==> Build 3 docker images with the following tags (latest, $TAG, $TAG_NO_PATCH)? y/n" -n 1 -r
+read -p "==> Build 3 docker images with the following tags (latest, $VERSION, $VERSION_NO_PATCH)? y/n" -n 1 -r
 echo
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
-		docker build -t "ostracon/ostracon" -t "ostracon/ostracon:$TAG" -t "ostracon/ostracon:$TAG_NO_PATCH" .
+		docker build -t "ostracon/ostracon" -t "ostracon/ostracon:$VERSION" -t "ostracon/ostracon:$VERSION_NO_PATCH" -f ./Dockerfile ../
 fi

DOCKER/push.sh

@@ -1,22 +1,17 @@
 #!/usr/bin/env bash
 set -e
 
-# Get the tag from the version, or try to figure it out.
-if [ -z "$TAG" ]; then
-	TAG=$(awk -F\" '/Version =/ { print $2; exit }' < ../version/version.go)
-fi
-if [ -z "$TAG" ]; then
-		echo "Please specify a tag."
-		exit 1
-fi
+# Get the git commit
+VERSION=$(git describe --always)
+echo "==> Building version $VERSION..."
 
-TAG_NO_PATCH=${TAG%.*}
+VERSION_NO_PATCH=${VERSION%.*}
 
-read -p "==> Push 3 docker images with the following tags (latest, $TAG, $TAG_NO_PATCH)? y/n" -n 1 -r
+read -p "==> Push 3 docker images with the following tags (latest, $VERSION, $VERSION_NO_PATCH)? y/n" -n 1 -r
 echo
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
 	docker push "ostracon/ostracon:latest"
-	docker push "ostracon/ostracon:$TAG"
-	docker push "ostracon/ostracon:$TAG_NO_PATCH"
+	docker push "ostracon/ostracon:$VERSION"
+	docker push "ostracon/ostracon:$VERSION_NO_PATCH"
 fi

scripts/dist.sh

@@ -4,23 +4,15 @@ set -e
 # WARN: non hermetic build (people must run this script inside docker to
 # produce deterministic binaries).
 
-# Get the version from the environment, or try to figure it out.
-if [ -z $VERSION ]; then
-	VERSION=$(awk -F\" '/Version =/ { print $2; exit }' < version/version.go)
-fi
-if [ -z "$VERSION" ]; then
-    echo "Please specify a version."
-    exit 1
-fi
-echo "==> Building version $VERSION..."
-
 # Delete the old dir
 echo "==> Removing old directory..."
 rm -rf build/pkg
 mkdir -p build/pkg
 
 # Get the git commit
-VERSION := "$(git describe --always)"
+VERSION=$(git describe --always)
+echo "==> Building version $VERSION..."
+
 GIT_IMPORT="github.com/line/ostracon/version"
 
 # Determine the arch/os combos we're building for