From 2af774f2e915f9652d9d65fda70c23d556033fa3 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 14 Apr 2017 14:48:31 -0500 Subject: [PATCH] tests: Move ltp/poweroff over to the linuxkit org Note, the jessie-slim image with the old sha256 does not exist anymore... Signed-off-by: Rolf Neugebauer --- test/ltp/Dockerfile.pkg | 2 +- test/ltp/Makefile | 10 +++++----- test/ltp/test-ltp.yml | 12 ++++++------ test/poweroff/Makefile | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/ltp/Dockerfile.pkg b/test/ltp/Dockerfile.pkg index f10eac135..a4118d9dd 100644 --- a/test/ltp/Dockerfile.pkg +++ b/test/ltp/Dockerfile.pkg @@ -1,4 +1,4 @@ -FROM debian:jessie-slim@sha256:2a14128195ab26b1c56c5773dda9def9b909c2e01596ef9108e2295d418210a3 +FROM debian:jessie-slim@sha256:fb22c1cef74071a6cd0145c1f91ca85ba9bd3f8b4d6db8560fe69eb36a175ca3 ADD . / WORKDIR /opt/ltp ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/ltp/Makefile b/test/ltp/Makefile index 20ad98a22..53fcbeab0 100644 --- a/test/ltp/Makefile +++ b/test/ltp/Makefile @@ -23,15 +23,15 @@ hash: Dockerfile.pkg ltp.tar check.sh $(DEPS) cat Dockerfile.pkg check.sh $(DEPS) | DOCKER_CONTENT_TRUST=1 docker run --rm -i $(SHASUM) sha1sum | sed 's/ .*//' > $@ push: hash - docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):$(shell cat 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 mobylinux/$(IMAGE):$(shell cat hash) || \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) + docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ + docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) docker rmi $(IMAGE):build rm -f hash diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml index d85bd81a8..072c0f6e6 100644 --- a/test/ltp/test-ltp.yml +++ b/test/ltp/test-ltp.yml @@ -1,14 +1,14 @@ kernel: - image: "mobylinux/kernel:4.9.x" + image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0" init: - linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b - - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 + - linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 + - linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b + - linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 onboot: - name: ltp - image: "mobylinux/test-ltp-20170116:d4722477c11e0006d6e5529efe241b6ae70ff3a9" + image: "linuxkit/test-ltp-20170116:81229df2d25065b06f0a3071faaace8d66c87e67" net: host pid: host binds: @@ -17,7 +17,7 @@ onboot: - all services: - name: poweroff - image: "mobylinux/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" + image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" pid: host capabilities: - CAP_SYS_BOOT diff --git a/test/poweroff/Makefile b/test/poweroff/Makefile index ec3b49d6e..9f254bf8d 100644 --- a/test/poweroff/Makefile +++ b/test/poweroff/Makefile @@ -11,15 +11,15 @@ hash: Dockerfile poweroff.sh docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c "cat $^ /lib/apk/db/installed | sha1sum" | sed 's/ .*//' > hash push: hash - docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ - (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ - docker push mobylinux/$(IMAGE):$(shell cat 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 mobylinux/$(IMAGE):$(shell cat hash) || \ - docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) + docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ + docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) docker rmi $(IMAGE):build rm -f hash