From e52f806f599f4beb4c8a2ffce98523833c8564e9 Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Tue, 25 Sep 2018 11:56:18 +0200
Subject: [PATCH] Add latest tag for x86_64
---
.gitlab-ci.yml | 4 ++--
image.mk | 14 +++++++++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30ea306..1520d46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,12 +6,12 @@ stages:
- build
variables:
- DOCKER_REGISTRY: registry.icinga.com
+ DOCKER_REGISTRY: ${CI_REGISTRY}
DOCKER_IMAGE_PREFIX: ${CI_PROJECT_PATH}/
before_script:
- docker info
- - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.icinga.com
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN ${CI_REGISTRY}
- apk -U add make
.build_job: &build_job
diff --git a/image.mk b/image.mk
index 8d05a70..f328a36 100644
--- a/image.mk
+++ b/image.mk
@@ -16,6 +16,12 @@ VERSION := $(shell basename `pwd`)
endif
IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT)
+ifeq ($(VARIANT),x86_64)
+IMAGE_EXTRA := $(IMAGE_PREFIX)$(DIST):latest
+else
+IMAGE_EXTRA :=
+endif
+
all: pull build
pull:
@@ -23,10 +29,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