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