Merge 4c50d0c into b57a56d

docker/multistage/Dockerfile

@@ -1,12 +1,11 @@
 # Builds Request Baskets service using multi-stage builds
-# Version 1.1
+# Version 1.2
 
 # Stage 1. Building service
 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 \

build.sh → scripts/build/build.sh

@@ -3,12 +3,14 @@
 # exit if any step fails
 set -e
 
-# change current dir to the script dir
+# change current dir to the script dir and then switch to project root
 cd "$(dirname "$0")"
+cd ../..
 
+# collect git version information
 GIT_VERSION="$(git describe)"
 GIT_COMMIT="$(git rev-parse HEAD)"
 GIT_COMMIT_SHORT="$(git rev-parse --short HEAD)"
 
-# build service with version information
+# build (and install) service with version information from project root for default architecture
 go get -ldflags "-X main.GitVersion=${GIT_VERSION} -X main.GitCommit=${GIT_COMMIT} -X main.GitCommitShort=${GIT_COMMIT_SHORT}"

scripts/build/build_docker.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# change current dir to the script dir and then switch to project root
+cd "$(dirname "$0")"
+cd ../..
+
+# build docker container from project root
+docker build -t request-baskets .

scripts/build/build_linux.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# exit if any step fails
+set -e
+
+# change current dir to the script dir and then switch to project root
+cd "$(dirname "$0")"
+cd ../..
+
+# collect git version information
+GIT_VERSION="$(git describe)"
+GIT_COMMIT="$(git rev-parse HEAD)"
+GIT_COMMIT_SHORT="$(git rev-parse --short HEAD)"
+
+# build service with version information from project root for Linux
+env GOOS=linux GOARCH=amd64 go build -ldflags "-X main.GitVersion=${GIT_VERSION} -X main.GitCommit=${GIT_COMMIT} -X main.GitCommitShort=${GIT_COMMIT_SHORT}"