From 8acb1211c62c2fa951348a38005af51c163107c3 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 12 Sep 2016 12:37:09 +0100 Subject: [PATCH] add experimental- prefix for experimental Docker versions in media Signed-off-by: Justin Cormack --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d3285ebfb..deeaa1009 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +DOCKER_EXPERIMENTAL?=1 + all: $(MAKE) -C alpine @@ -28,12 +30,15 @@ test: Dockerfile.test alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 TAG=$(shell git rev-parse HEAD) STATUS=$(shell git status -s) +ifeq ($(DOCKER_EXPERIMENTAL),1) +EXP_PREFIX=experimental- +endif media: Dockerfile.media alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 alpine/mobylinux-bios.iso alpine/mobylinux-efi.iso ifeq ($(STATUS),) - tar cf - $^ alpine/mobylinux.efi | docker build -f Dockerfile.media -t mobylinux/media:latest - - docker tag mobylinux/media:latest mobylinux/media:$(TAG) - docker push mobylinux/media:$(TAG) - docker push mobylinux/media:latest + tar cf - $^ alpine/mobylinux.efi | docker build -f Dockerfile.media -t mobylinux/media:$(EXP_PREFIX)latest - + docker tag mobylinux/media:$(EXP_PREFIX)latest mobylinux/media:$(EXP_PREFIX)$(TAG) + docker push mobylinux/media:$(EXP_PREFIX)$(TAG) + docker push mobylinux/media:$(EXP_PREFIX)latest else $(error "git not clean") endif