From d5535ea3e49db459ed381286177708c9b8de917b Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 28 Jun 2017 14:50:01 +0100 Subject: [PATCH] tools/qemu: Use common pkg/package.mk to drive Makefile Signed-off-by: Ian Campbell --- tools/qemu/Makefile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile index 0496d8d0e..b52fa7214 100644 --- a/tools/qemu/Makefile +++ b/tools/qemu/Makefile @@ -1,15 +1,3 @@ -.PHONY: tag push -default: push +include ../../pkg/package.mk -ORG?=linuxkit IMAGE=qemu -DEPS=Dockerfile Makefile - -HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') - -tag: $(DEPS) - DOCKER_CONTENT_TRUST=1 docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) . - -push: tag - docker pull $(ORG)/$(IMAGE):$(HASH) || \ - docker push $(ORG)/$(IMAGE):$(HASH)