From 9cb3c53b8f68f18fbcd796a908897e8155ca5895 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 5 May 2017 16:59:12 +0100 Subject: [PATCH] tests: Use git tree hash for virtsock package Signed-off-by: Rolf Neugebauer --- test/pkg/virtsock/Makefile | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/test/pkg/virtsock/Makefile b/test/pkg/virtsock/Makefile index a88497657..69278eba1 100644 --- a/test/pkg/virtsock/Makefile +++ b/test/pkg/virtsock/Makefile @@ -1,26 +1,14 @@ .PHONY: tag push -IMAGE=test-virtsock - default: push +IMAGE=test-virtsock DEPS=Dockerfile Makefile -SHASUM=alpine:3.5 -hash: $(DEPS) - find $^ -type f | xargs cat | DOCKER_CONTENT_TRUST=1 docker run --rm -i $(SHASUM) sha1sum | sed 's/ .*//' > $@ -tag: hash - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ - (docker build --no-cache -t $(IMAGE):build . && \ - docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)) - docker rmi $(IMAGE):build || true +HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') + +tag: $(DEPS) + docker build --no-cache -t linuxkit/$(IMAGE):$(HASH) . push: tag - docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ - docker push linuxkit/$(IMAGE):$(shell cat hash) - rm -f hash - -clean: - rm -rf hash - docker rmi $(IMAGE):build || true - -.DELETE_ON_ERROR: + docker pull linuxkit/$(IMAGE):$(HASH) || \ + docker push linuxkit/$(IMAGE):$(HASH)