From 103b517ef6040f8cb4717264d18cc6b2bc11bdcc Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 14 Apr 2017 14:20:47 -0500 Subject: [PATCH] tests: Move dockerbench over to use the linuxkit org Signed-off-by: Rolf Neugebauer --- test/docker-bench/Makefile | 10 +++++----- test/docker-bench/test-docker-bench.yml | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/docker-bench/Makefile b/test/docker-bench/Makefile index dc7aa2468..8388678d9 100644 --- a/test/docker-bench/Makefile +++ b/test/docker-bench/Makefile @@ -11,15 +11,15 @@ hash: Dockerfile bench_runner.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 diff --git a/test/docker-bench/test-docker-bench.yml b/test/docker-bench/test-docker-bench.yml index 62e13fe84..0bc8b60f7 100644 --- a/test/docker-bench/test-docker-bench.yml +++ b/test/docker-bench/test-docker-bench.yml @@ -1,11 +1,11 @@ kernel: - image: "mobylinux/kernel:4.9.x" + image: "linuxkit/kernel:4.9.x" cmdline: "console=ttyS0 console=tty0 page_poison=1" 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: sysctl image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a" @@ -16,21 +16,21 @@ onboot: - CAP_SYS_ADMIN readonly: true - name: sysfs - image: mobylinux/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c + image: "linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c" - name: binfmt image: "linuxkit/binfmt:8881283ac627be1542811bd25c85e7782aebc692" binds: - /proc/sys/fs/binfmt_misc:/binfmt_misc readonly: true - name: format - image: "mobylinux/format:53748000acf515549d398e6ae68545c26c0f3a2e" + image: "linuxkit/format:53748000acf515549d398e6ae68545c26c0f3a2e" binds: - /dev:/dev capabilities: - CAP_SYS_ADMIN - CAP_MKNOD - name: mount - image: "mobylinux/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a" + image: "linuxkit/mount:d2669e7c8ddda99fa0618a414d44261eba6e299a" binds: - /dev:/dev - /var:/var:rshared,rbind @@ -40,13 +40,13 @@ onboot: command: ["/mount.sh", "/var/lib/docker"] services: - name: rngd - image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9" + image: "linuxkit/rngd:f5e5be43e730ea819c3293d5c6dcbfa7f4c5c314" capabilities: - CAP_SYS_ADMIN oomScoreAdj: -800 readonly: true - name: dhcpcd - image: "mobylinux/dhcpcd:57a8ef29d3a910645b2b24c124f9ce9ef53ce703" + image: "linuxkit/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd" binds: - /var:/var - /tmp/etc:/etc @@ -57,7 +57,7 @@ services: net: host oomScoreAdj: -800 - name: docker - image: "mobylinux/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" + image: "linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08" capabilities: - all net: host @@ -69,7 +69,7 @@ services: - /lib/modules:/lib/modules - /run:/var/run - name: test-docker-bench - image: "mobylinux/test-docker-bench:2f941429d874c5dcf05e38005affb4f10192e1a8" + image: "linuxkit/test-docker-bench:2f941429d874c5dcf05e38005affb4f10192e1a8" ipc: host pid: host net: host @@ -79,6 +79,6 @@ services: - all trust: image: - - mobylinux/kernel + - linuxkit/kernel outputs: - format: kernel+initrd