github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-26 20:18:52 +00:00
Code Issues Projects Releases Wiki Activity

add experimental- prefix for experimental Docker versions in media

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-09-12 12:37:09 +01:00
parent 955aad6276
commit 9b2e1367f9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -1,3 +1,5 @@
DOCKER_EXPERIMENTAL?=1
all: all:
$(MAKE) -C alpine $(MAKE) -C alpine
@ -28,12 +30,15 @@ test: Dockerfile.test alpine/initrd.img alpine/kernel/x86_64/vmlinuz64
TAG=$(shell git rev-parse HEAD) TAG=$(shell git rev-parse HEAD)
STATUS=$(shell git status -s) 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 media: Dockerfile.media alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 alpine/mobylinux-bios.iso alpine/mobylinux-efi.iso
ifeq ($(STATUS),) ifeq ($(STATUS),)
tar cf - $^ alpine/mobylinux.efi | docker build -f Dockerfile.media -t mobylinux/media:latest - tar cf - $^ alpine/mobylinux.efi | docker build -f Dockerfile.media -t mobylinux/media:$(EXP_PREFIX)latest -
docker tag mobylinux/media:latest mobylinux/media:$(TAG) docker tag mobylinux/media:$(EXP_PREFIX)latest mobylinux/media:$(EXP_PREFIX)$(TAG)
docker push mobylinux/media:$(TAG) docker push mobylinux/media:$(EXP_PREFIX)$(TAG)
docker push mobylinux/media:latest docker push mobylinux/media:$(EXP_PREFIX)latest
else else
$(error "git not clean") $(error "git not clean")
endif endif