github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-24 19:28:09 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

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