From b2655c1bbe8bf1268d5dd031988d06a95d7ec27b Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Fri, 26 May 2017 15:34:27 -0700 Subject: [PATCH] Rename and sign linuxkit/test-ltp Signed-off-by: Riyaz Faizullabhoy --- test/hack/test-ltp.yml | 2 +- test/pkg/ltp/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 06523fdad..cf334606b 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -7,7 +7,7 @@ init: - linuxkit/containerd:b1766e4c4c09f63ac4925a6e4612852a93f7e73b onboot: - name: ltp - image: "linuxkit/test-ltp-20170116:81229df2d25065b06f0a3071faaace8d66c87e67" + image: "linuxkit/test-ltp:20170116" net: host pid: host binds: diff --git a/test/pkg/ltp/Makefile b/test/pkg/ltp/Makefile index 862f71049..b9c05f8e8 100644 --- a/test/pkg/ltp/Makefile +++ b/test/pkg/ltp/Makefile @@ -11,7 +11,7 @@ ltp.tar: ltp.tag docker run --rm --net=none --log-driver=none $(shell cat ltp.tag) tar cf - opt/ltp > $@ SHASUM=alpine:3.5 -IMAGE=test-ltp-$(LTP_VERSION) +IMAGE=test-ltp # Note: We do not compute the hash from all the dependencies here # because the ltp binaries will change everytime we build. Ideally, we @@ -25,7 +25,9 @@ hash: Dockerfile.pkg ltp.tar check.sh $(DEPS) push: hash DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ (docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ - DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)) + docker tag $(IMAGE):build linuxkit/$(IMAGE):$(LTP_VERSION) && \ + DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash) && \ + DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(LTP_VERSION)) docker rmi $(IMAGE):build rm -f hash