From 600e46452d5e64b3f2460f9b2ce1fa97c7de0ced Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Tue, 3 Apr 2018 10:44:24 +0200
Subject: [PATCH] Update image naming
---
image.mk | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/image.mk b/image.mk
index 87b116e..1ab7ca0 100644
--- a/image.mk
+++ b/image.mk
@@ -2,7 +2,7 @@ OS := debian
IMAGE_PREFIX := ${DOCKER_IMAGE_PREFIX}
ifeq ($(IMAGE_PREFIX),)
-IMAGE_PREFIX := icinga/
+IMAGE_PREFIX := icinga/debian/
endif
REGISTRY := ${DOCKER_REGISTRY}
@@ -11,9 +11,9 @@ IMAGE_PREFIX := $(REGISTRY)/$(IMAGE_PREFIX)
endif
FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
-VERSION := $(shell basename $$(dirname `pwd`))
-IMAGE_SUFFIX := -$(shell basename `pwd`)
-IMAGE := $(IMAGE_PREFIX)$(OS)-$(VERSION)$(IMAGE_SUFFIX)
+DIST := $(shell basename $$(dirname `pwd`))
+VARIANT := $(shell basename `pwd`)
+IMAGE := $(IMAGE_PREFIX)$(DIST):$(VARIANT)
all: pull build
--
GitLab