Skip to content
Snippets Groups Projects
Commit 2fa72d71 authored by Markus Frosch's avatar Markus Frosch
Browse files

Update image names

parent ef169eb9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
6-i386/Makefile
+ 1
− 1
View file @ 2fa72d71
IMAGE_SUFFIX := -x86 VARIANT := x86
include ../image.mk include ../image.mk
6/Makefile
+ 1
− 1
View file @ 2fa72d71
IMAGE_SUFFIX := -x86_64 VARIANT := x86_64
include ../image.mk include ../image.mk
7/Makefile
+ 1
− 1
View file @ 2fa72d71
IMAGE_SUFFIX := -x86_64 VARIANT := x86_64
include ../image.mk include ../image.mk
image.mk
+ 2
− 2
View file @ 2fa72d71
...@@ -2,7 +2,7 @@ OS := centos ...@@ -2,7 +2,7 @@ OS := centos
IMAGE_PREFIX := ${DOCKER_IMAGE_PREFIX} IMAGE_PREFIX := ${DOCKER_IMAGE_PREFIX}
ifeq ($(IMAGE_PREFIX),) ifeq ($(IMAGE_PREFIX),)
IMAGE_PREFIX := icinga/ IMAGE_PREFIX := icinga/$(OS)/
endif endif
REGISTRY := ${DOCKER_REGISTRY} REGISTRY := ${DOCKER_REGISTRY}
...@@ -12,7 +12,7 @@ endif ...@@ -12,7 +12,7 @@ endif
FROM := $(shell grep FROM Dockerfile | cut -d" " -f2) FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
VERSION := $(shell basename `pwd`) VERSION := $(shell basename `pwd`)
IMAGE := $(IMAGE_PREFIX)$(OS)-$(VERSION)$(IMAGE_SUFFIX) IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT)
all: pull build all: pull build
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment