Update image naming

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