From df19ad752a0af720a9be1d3de78b39b47fc4b1ba Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Wed, 26 Jul 2017 14:08:54 +0100
Subject: [PATCH] tools/mkimage-iso-*: Transition to alpine base + package.mk

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 tools/mkimage-iso-bios/Dockerfile |  2 +-
 tools/mkimage-iso-bios/Makefile   | 29 ++---------------------------
 tools/mkimage-iso-efi/Dockerfile  |  2 +-
 tools/mkimage-iso-efi/Makefile    | 29 ++---------------------------
 4 files changed, 6 insertions(+), 56 deletions(-)

diff --git a/tools/mkimage-iso-bios/Dockerfile b/tools/mkimage-iso-bios/Dockerfile
index f49ee54e8..1c98f2caa 100644
--- a/tools/mkimage-iso-bios/Dockerfile
+++ b/tools/mkimage-iso-bios/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908
 
 RUN \
   apk update && apk upgrade && \
diff --git a/tools/mkimage-iso-bios/Makefile b/tools/mkimage-iso-bios/Makefile
index 02622fc7f..ff6f47e3c 100644
--- a/tools/mkimage-iso-bios/Makefile
+++ b/tools/mkimage-iso-bios/Makefile
@@ -1,29 +1,4 @@
-.PHONY: tag push
-
-BASE=alpine:3.5
 IMAGE=mkimage-iso-bios
+DEPS=make-iso
 
-default: push
-
-hash: Dockerfile make-iso
-	DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
-	tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
-	docker run --rm --entrypoint /bin/sh $(IMAGE):build -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
-
-push: hash
-	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
-		 docker push linuxkit/$(IMAGE):$(shell cat hash))
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-tag: hash
-	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-clean:
-	rm -f hash
-
-.DELETE_ON_ERROR:
+include ../../pkg/package.mk
diff --git a/tools/mkimage-iso-efi/Dockerfile b/tools/mkimage-iso-efi/Dockerfile
index d68795744..034e666e2 100644
--- a/tools/mkimage-iso-efi/Dockerfile
+++ b/tools/mkimage-iso-efi/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908
 
 RUN \
   apk update && apk upgrade && \
diff --git a/tools/mkimage-iso-efi/Makefile b/tools/mkimage-iso-efi/Makefile
index 08438ed0f..f5c9aa86d 100644
--- a/tools/mkimage-iso-efi/Makefile
+++ b/tools/mkimage-iso-efi/Makefile
@@ -1,29 +1,4 @@
-.PHONY: tag push
-
-BASE=alpine:3.5
 IMAGE=mkimage-iso-efi
+DEPS=make-efi
 
-default: push
-
-hash: Dockerfile make-efi
-	DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
-	tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
-	docker run --rm --entrypoint /bin/sh $(IMAGE):build -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
-
-push: hash
-	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
-		 docker push linuxkit/$(IMAGE):$(shell cat hash))
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-tag: hash
-	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
-	docker rmi $(IMAGE):build
-	rm -f hash
-
-clean:
-	rm -f hash
-
-.DELETE_ON_ERROR:
+include ../../pkg/package.mk