From 66d01101911fb266275838f77a4c38fc652188ae Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Mon, 2 Sep 2019 11:11:12 +0200
Subject: [PATCH] Update image.mk to use standard CI variables
---
.gitlab-ci.yml | 4 ----
image.mk | 35 ++++++++++++++---------------------
2 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1520d46..65f0952 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,6 @@ services:
stages:
- build
-variables:
- DOCKER_REGISTRY: ${CI_REGISTRY}
- DOCKER_IMAGE_PREFIX: ${CI_PROJECT_PATH}/
-
before_script:
- docker info
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN ${CI_REGISTRY}
diff --git a/image.mk b/image.mk
index e3327d9..b0cb2a3 100644
--- a/image.mk
+++ b/image.mk
@@ -1,27 +1,20 @@
-OS := centos
-
-IMAGE_PREFIX := ${DOCKER_IMAGE_PREFIX}
-ifeq ($(IMAGE_PREFIX),)
-IMAGE_PREFIX := icinga/$(OS)/
+ifndef CI_REGISTRY
+CI_REGISTRY := registry.icinga.com
endif
-
-REGISTRY := ${DOCKER_REGISTRY}
-ifneq ($(REGISTRY),)
-IMAGE_PREFIX := $(REGISTRY)/$(IMAGE_PREFIX)
+ifeq ($(CI_PROJECT_PATH),)
+CI_PROJECT_PATH := build-docker/centos
endif
FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
-ifeq ($(VERSION),)
-VERSION := $(shell basename `pwd`)
-endif
-IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT)
+VERSION := $(shell basename $$(pwd))
+IMAGE := $(CI_PROJECT_PATH)/$(VERSION)
-ifeq ($(VARIANT),x86_64)
-IMAGE_EXTRA := $(IMAGE_PREFIX)$(VERSION):latest
-else
-IMAGE_EXTRA :=
+ifneq ($(CI_REGISTRY),)
+IMAGE := $(CI_REGISTRY)/$(IMAGE)
endif
+IMAGE_EXTRA_TAG := x86_64
+
all: pull build
pull:
@@ -30,14 +23,14 @@ pull:
build:
docker build --cache-from "${IMAGE}" --tag "$(IMAGE)" .
-ifneq ($(IMAGE_EXTRA),)
- docker tag "$(IMAGE)" "$(IMAGE_EXTRA)"
+ifdef IMAGE_EXTRA_TAG
+ docker tag "$(IMAGE)" "$(IMAGE):$(IMAGE_EXTRA_TAG)"
endif
push:
docker push "$(IMAGE)"
-ifneq ($(IMAGE_EXTRA),)
- docker push "$(IMAGE_EXTRA)"
+ifdef IMAGE_EXTRA_TAG
+ docker push "$(IMAGE):$(IMAGE_EXTRA_TAG)"
endif
clean:
--
GitLab