fixed issue with Docker hub making only shallow clone, reorganized bu…

…ild scripts
darklynx · Jan 17, 2019 · 5861b7d · 5861b7d
1 parent b57a56d
commit 5861b7d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 2 deletions.
diff --git a/docker/multistage/Dockerfile b/docker/multistage/Dockerfile
@@ -5,8 +5,7 @@
 FROM golang:latest as builder
 WORKDIR /go/src/rbaskets
 COPY . .
-RUN set -e \
-  && GIT_VERSION="$(git describe)" \
+RUN GIT_VERSION="$(git describe || git symbolic-ref -q --short HEAD)" \
   && GIT_COMMIT="$(git rev-parse HEAD)" \
   && GIT_COMMIT_SHORT="$(git rev-parse --short HEAD)" \
   && set -x \

diff --git a/build.sh → scripts/build/build.sh b/build.sh → scripts/build/build.sh
@@ -5,6 +5,7 @@ set -e
 
 # change current dir to the script dir
 cd "$(dirname "$0")"
+cd ../..
 
 GIT_VERSION="$(git describe)"
 GIT_COMMIT="$(git rev-parse HEAD)"

diff --git a/scripts/build/build_docker.sh b/scripts/build/build_docker.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# exit if any step fails
+set -e
+
+# change current dir to the script dir
+cd "$(dirname "$0")"
+cd ../..
+
+docker build -f docker/multistage/Dockerfile -t request-baskets .
diff --git a/scripts/build/build_linux.sh b/scripts/build/build_linux.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# exit if any step fails
+set -e
+
+# change current dir to the script dir
+cd "$(dirname "$0")"
+cd ../..
+
+GIT_VERSION="$(git describe)"
+GIT_COMMIT="$(git rev-parse HEAD)"
+GIT_COMMIT_SHORT="$(git rev-parse --short HEAD)"
+
+# build service with version information
+env GOOS=linux GOARCH=amd64 go build -ldflags "-X main.GitVersion=${GIT_VERSION} -X main.GitCommit=${GIT_COMMIT} -X main.GitCommitShort=${GIT_COMMIT_SHORT}"