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 <ijc@docker.com>
This commit is contained in:
Ian Campbell 2019-02-11 15:59:26 +00:00
parent 1fb71a127e
commit b5c6c3ceeb
2 changed files with 15 additions and 1 deletions

View File

@ -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"]}],}'

View File

@ -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"]