From b5c6c3ceeba9a5fe88260a5103e5977c914ef115 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 11 Feb 2019 15:59:26 +0000 Subject: [PATCH] test/pkg/containerd: move config to build.yml ... from the old-skool label scheme. No semantic change intended. Some keys are in different orders and the "mounts" entry gained an empty "destination" key, neither of which makes a practical difference. Signed-off-by: Ian Campbell --- test/pkg/containerd/Dockerfile | 1 - test/pkg/containerd/build.yml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index 79c5cfc63..547d31afe 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -29,4 +29,3 @@ WORKDIR $GOPATH/src/github.com/containerd/containerd ADD run.sh ./run.sh ENTRYPOINT ["/bin/sh", "run.sh"] -LABEL org.mobyproject.config='{"capabilities": ["all"], "tmpfs": ["/tmp"], "binds": ["/dev:/dev", "/var/lib:/var/lib", "/etc/resolv.conf:/etc/resolv.conf", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/containerd:/usr/bin/containerd", "/usr/bin/containerd-shim:/usr/bin/containerd-shim"], "mounts": [{"type": "cgroup", "options": ["rw","nosuid","noexec","nodev","relatime"]}],}' diff --git a/test/pkg/containerd/build.yml b/test/pkg/containerd/build.yml index fb2956359..52b324254 100644 --- a/test/pkg/containerd/build.yml +++ b/test/pkg/containerd/build.yml @@ -1 +1,16 @@ image: test-containerd +config: + capabilities: + - all + tmpfs: + - /tmp + binds: + - /dev:/dev + - /var/lib:/var/lib + - /etc/resolv.conf:/etc/resolv.conf + - /usr/bin/runc:/usr/bin/runc + - /usr/bin/containerd:/usr/bin/containerd + - /usr/bin/containerd-shim:/usr/bin/containerd-shim + mounts: + - type: cgroup + options: ["rw","nosuid","noexec","nodev","relatime"]