From e77368c35407bf8cb16751344c25a6e36d8e8e2b Mon Sep 17 00:00:00 2001
From: Bastien Abadie <bastien@nextcairn.com>
Date: Fri, 27 Apr 2018 16:07:21 +0200
Subject: [PATCH] Do not check gitlab token in makefile
---
Makefile | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 043ca03841..22c0d27641 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
VERSION=$(shell git rev-parse --short HEAD)
TAG=arkindex-backend
-build: require-gitlab
- docker build $(ROOT_DIR) --build-arg GITLAB_TOKEN=${GITLAB_TOKEN} -t $(TAG):$(VERSION)
+build:
+ docker build $(ROOT_DIR) -t $(TAG):$(VERSION)
publish-version: require-docker-auth
$(MAKE) build TAG=registry.gitlab.com/arkindex/backend
@@ -20,9 +20,6 @@ release: require-version
require-docker-auth:
@grep registry.gitlab.com ~/.docker/config.json > /dev/null || (echo "Docker Login on registry.gitlab.com"; docker login registry.gitlab.com)
-require-gitlab:
- @if [ ! "${GITLAB_TOKEN}" ]; then echo "Missing GITLAB_TOKEN environment variable"; exit 1; fi
-
require-version:
@if [ ! "$(version)" ]; then echo "Missing version to publish"; exit 1; fi
@git rev-parse $(version) >/dev/null 2>&1 && (echo "Version $(version) already exists on local git repo !" && exit 1) || true
--
GitLab