From 38ef228b7b9120ffbd8b2eb7d6ca7cc0ff96ccc9 Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Mon, 6 Feb 2017 15:45:33 +0000
Subject: [PATCH] Simpler media Dockerfiles

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 Dockerfile.kernel |  2 --
 Dockerfile.media  | 11 +----------
 Makefile          |  7 +++++--
 3 files changed, 6 insertions(+), 14 deletions(-)
 delete mode 100644 Dockerfile.kernel

diff --git a/Dockerfile.kernel b/Dockerfile.kernel
deleted file mode 100644
index 58c75b00f..000000000
--- a/Dockerfile.kernel
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM scratch
-ADD . /
diff --git a/Dockerfile.media b/Dockerfile.media
index 2387c105e..0ae088190 100644
--- a/Dockerfile.media
+++ b/Dockerfile.media
@@ -1,12 +1,3 @@
 FROM mobylinux/toybox-media:0a26fe5f574e444849983f9c4148ef74b3804d55@sha256:5ac38f77b66deb194c9016591b9b096e81fcdc9f7c3e6d01566294a6b4b4ebd2
 
-ADD \
-  alpine/initrd.img \
-  alpine/initrd-test.img \
-  kernel/x86_64/vmlinuz64 \
-  kernel/x86_64/vmlinux \
-  kernel/x86_64/kernel-headers.tar \
-  kernel/x86_64/kernel-dev.tar \
-  alpine/mobylinux-efi.iso \
-  alpine/mobylinux.efi \
-  / 
+ADD . /
diff --git a/Makefile b/Makefile
index 449a79c39..5f2fe2b15 100644
--- a/Makefile
+++ b/Makefile
@@ -88,14 +88,17 @@ endif
 MEDIA_IMAGE=mobylinux/media:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG)
 INITRD_IMAGE=mobylinux/mobylinux:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG)
 KERNEL_IMAGE=mobylinux/kernel:$(MEDIA_PREFIX)$(AUFS_PREFIX)$(TAG)
+
+MEDIA_TARBALL=Dockerfile.media -C alpine initrd.img initrd-test.img mobylinux-efi.iso mobylinux.efi -C ../kernel/x86_64 vmlinuz64 vmlinux kernel-headers.tar kernel-dev.tar
+
 media: Dockerfile.media alpine/initrd.img alpine/initrd-test.img kernel/x86_64/vmlinuz64 alpine/mobylinux-efi.iso
 ifeq ($(STATUS),)
-	tar cf - $^ alpine/mobylinux.efi kernel/x86_64/vmlinux kernel/x86_64/kernel-headers.tar kernel/x86_64/kernel-dev.tar | docker build -f Dockerfile.media -t $(MEDIA_IMAGE) -
+	tar cf - $(MEDIA_TARBALL) | docker build -f Dockerfile.media -t $(MEDIA_IMAGE) -
 	docker push $(MEDIA_IMAGE)
 	[ -f $(MOBYLINUX_TAG) ]
 	docker tag $(shell cat $(MOBYLINUX_TAG)) $(INITRD_IMAGE)
 	docker push $(INITRD_IMAGE)
-	tar cf - Dockerfile.kernel kernel/x86_64/vmlinuz64 | docker build -f Dockerfile.kernel -t $(KERNEL_IMAGE) -
+	tar cf - Dockerfile.media -C kernel/x86_64 vmlinuz64 | docker build -f Dockerfile.media -t $(KERNEL_IMAGE) -
 	docker push $(KERNEL_IMAGE)
 else
 	$(error "git not clean")