From 974b622c0601464328c652f4f6d10ca95e54cc3d Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 28 Jun 2017 13:16:24 +0100 Subject: [PATCH] swarmd: Update to latest WIP code This version is more up to date and works with the current containerd packages. swarmd needs /tmp to share /tmp/containerd with containerd. Signed-off-by: Ian Campbell --- projects/swarmd/swarmd.yml | 3 ++- projects/swarmd/swarmd/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml index 111b97d1e..960a1fe3b 100644 --- a/projects/swarmd/swarmd.yml +++ b/projects/swarmd/swarmd.yml @@ -35,12 +35,13 @@ services: - name: ntpd image: "linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90" - name: swarmd - image: "linuxkit/swarmd:1002422b78339a767559058d704b086889e90447" + image: "linuxkit/swarmd:a65dc4a5464a56771af056387b85d3d4593dbcf0" command: ["/usr/bin/swarmd", "--containerd-addr=/run/containerd/containerd.sock", "--log-level=debug", "--state-dir=/var/lib/swarmd"] capabilities: - all pid: host binds: + - /tmp:/tmp - /run/containerd/containerd.sock:/run/containerd/containerd.sock - /var/lib/containerd:/var/lib/containerd - /var/lib/swarmd:/var/lib/swarmd diff --git a/projects/swarmd/swarmd/Dockerfile b/projects/swarmd/swarmd/Dockerfile index f07908c7f..9733df026 100644 --- a/projects/swarmd/swarmd/Dockerfile +++ b/projects/swarmd/swarmd/Dockerfile @@ -16,7 +16,7 @@ ENV GOPATH=/root/go # https://github.com/ijc25/swarmkit/tree/containerd-wip ENV SWARMKIT_REPO=https://github.com/ijc25/swarmkit ENV SWARMKIT_BRANCH=containerd-wip -ENV SWARMKIT_COMMIT=cb429323fa86df0c279a8d629e674f79a20e01e3 +ENV SWARMKIT_COMMIT=4a484ccb498bee117fe6167d5a5e7ea0f6d4f2e9 RUN mkdir -p $GOPATH/src/github.com/docker && \ cd $GOPATH/src/github.com/docker && \