Merge branch 'devops20-monitoring' into 'master'

Devops20 monitoring

See merge request !24

.gitlab-ci.yml

@@ -15,7 +15,7 @@ build:
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.vereign.com
   script:
-    - docker build --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $TEST_IMAGE -f Dockerfile .
+    - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $TEST_IMAGE -f Dockerfile .
     - docker push $TEST_IMAGE
     - docker tag $TEST_IMAGE $TEST_IMAGE_SHA
     - docker push $TEST_IMAGE_SHA

Dockerfile

@@ -10,6 +10,8 @@ ENV SERVER_PKG_BUILD ${PKG}
 
 ARG CI_JOB_TOKEN
 ARG CI_PROJECT_NAME
+ARG CI_COMMIT_REF_NAME
+ARG CI_COMMIT_SHA
 
 ENV CI_PROJECT_NAME ${CI_PROJECT_NAME} 
 

Makefile

@@ -2,9 +2,7 @@ SERVER_OUT := "bin/server"
 PKG := "code.vereign.com/code/key-storage-agent"
 SERVER_PKG_BUILD := "${PKG}"
 PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
-BRANCH := $(shell git branch | grep \* | cut -d ' ' -f2)
-COMMIT := $(shell git branch | git describe --always --long --dirty)
-VER := $(BRANCH).$(COMMIT)
+VER := $(CI_COMMIT_REF_NAME).$(CI_COMMIT_SHA)
 
 .PHONY: all api server