From 19252dd667dfecb84a914315e6ac666a43e9e444 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Tue, 25 Sep 2018 12:01:03 +0200
Subject: [PATCH] Add latest tag for x86_64
---
image.mk | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/image.mk b/image.mk
index 632b0cd..7b82f4f 100644
--- a/image.mk
+++ b/image.mk
@@ -14,6 +14,12 @@ FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
VERSION := $(shell basename `pwd`)
IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT)
+ifeq ($(VARIANT),x86_64)
+IMAGE_EXTRA := $(IMAGE_PREFIX)$(DIST):latest
+else
+IMAGE_EXTRA :=
+endif
+
all: pull build
pull:
@@ -21,10 +27,16 @@ pull:
docker pull "$(FROM)"
build:
- docker build --cache-from "$(IMAGE)" --tag "$(IMAGE)" .
+ docker build --cache-from "${IMAGE}" --tag "$(IMAGE)" .
+ifneq ($(IMAGE_EXTRA),)
+ docker tag "$(IMAGE)" "$(IMAGE_EXTRA)"
+endif
push:
docker push "$(IMAGE)"
+ifneq ($(IMAGE_EXTRA),)
+ docker push "$(IMAGE_EXTRA)"
+endif
clean:
if (docker inspect --type image "$(IMAGE)" >/dev/null 2>&1); then docker rmi "$(IMAGE)"; fi
--
GitLab