Merge pull request #789 from justincormack/no-experimental-2

Remove more references to EXPERIMENTAL
This commit is contained in:
Justin Cormack 2016-11-24 07:11:31 -08:00 committed by GitHub
commit 87ff76fd97

View File

@ -1,5 +1,3 @@
DOCKER_EXPERIMENTAL?=0
all:
$(MAKE) -C alpine
@ -40,9 +38,6 @@ 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)
MEDIA_PREFIX?=experimental-
endif
media: Dockerfile.media alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 alpine/mobylinux-efi.iso
ifeq ($(STATUS),)
tar cf - $^ alpine/mobylinux.efi alpine/kernel/x86_64/vmlinux | docker build -f Dockerfile.media -t mobylinux/media:$(MEDIA_PREFIX)$(TAG) -