From 9a7dfad98b1c47d617750ff207e17e783684b354 Mon Sep 17 00:00:00 2001
From: Olgun Cengiz <olgun.cengiz@vereign.com>
Date: Thu, 22 Nov 2018 20:39:49 +0300
Subject: [PATCH] update
---
.gitlab-ci.yml | 2 +-
Dockerfile | 2 ++
Makefile | 4 +---
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c4dd1d..39d0076 100644
--- a/.gitlab-ci.yml
+++ b/.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
diff --git a/Dockerfile b/Dockerfile
index e7b3160..b621ec9 100644
--- a/Dockerfile
+++ b/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}
diff --git a/Makefile b/Makefile
index 50f814c..d005b54 100644
--- a/Makefile
+++ b/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 rev-parse --abbrev-ref HEAD)
-COMMIT := $(shell git describe --always --long --dirty)
-VER := $(BRANCH).$(COMMIT)
+VER := $(CI_COMMIT_REF_NAME).$(CI_COMMIT_SHA)
.PHONY: all api server
--
GitLab