From 2fa72d715f749146685dd7d8217cde0d632bb357 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Tue, 3 Apr 2018 11:58:20 +0200
Subject: [PATCH] Update image names
---
6-i386/Makefile | 2 +-
6/Makefile | 2 +-
7/Makefile | 2 +-
image.mk | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/6-i386/Makefile b/6-i386/Makefile
index 1e189c5..dd66b3f 100644
--- a/6-i386/Makefile
+++ b/6-i386/Makefile
@@ -1,2 +1,2 @@
-IMAGE_SUFFIX := -x86
+VARIANT := x86
include ../image.mk
diff --git a/6/Makefile b/6/Makefile
index d392171..f451fe1 100644
--- a/6/Makefile
+++ b/6/Makefile
@@ -1,2 +1,2 @@
-IMAGE_SUFFIX := -x86_64
+VARIANT := x86_64
include ../image.mk
diff --git a/7/Makefile b/7/Makefile
index d392171..f451fe1 100644
--- a/7/Makefile
+++ b/7/Makefile
@@ -1,2 +1,2 @@
-IMAGE_SUFFIX := -x86_64
+VARIANT := x86_64
include ../image.mk
diff --git a/image.mk b/image.mk
index 4e451ff..a6f52bc 100644
--- a/image.mk
+++ b/image.mk
@@ -2,7 +2,7 @@ OS := centos
IMAGE_PREFIX := ${DOCKER_IMAGE_PREFIX}
ifeq ($(IMAGE_PREFIX),)
-IMAGE_PREFIX := icinga/
+IMAGE_PREFIX := icinga/$(OS)/
endif
REGISTRY := ${DOCKER_REGISTRY}
@@ -12,7 +12,7 @@ endif
FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
VERSION := $(shell basename `pwd`)
-IMAGE := $(IMAGE_PREFIX)$(OS)-$(VERSION)$(IMAGE_SUFFIX)
+IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT)
all: pull build
--
GitLab