From 2f7737376abd7502bef3b85740e800805cd7d0ef Mon Sep 17 00:00:00 2001 From: Markus Frosch <markus.frosch@icinga.com> Date: Wed, 23 May 2018 13:36:05 +0200 Subject: [PATCH] 6-i386: Fix image name --- 6-i386/Makefile | 1 + image.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/6-i386/Makefile b/6-i386/Makefile index dd66b3f..4082e81 100644 --- a/6-i386/Makefile +++ b/6-i386/Makefile @@ -1,2 +1,3 @@ +VERSION := 6 VARIANT := x86 include ../image.mk diff --git a/image.mk b/image.mk index c662dd3..8d05a70 100644 --- a/image.mk +++ b/image.mk @@ -11,7 +11,9 @@ IMAGE_PREFIX := $(REGISTRY)/$(IMAGE_PREFIX) endif FROM := $(shell grep FROM Dockerfile | cut -d" " -f2) +ifeq ($(VERSION),) VERSION := $(shell basename `pwd`) +endif IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT) all: pull build -- GitLab