github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

swarmd: Update to latest WIP code

Browse Source 
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 <ian.campbell@docker.com>
This commit is contained in:
Ian Campbell 2017-06-28 13:16:24 +01:00
parent 415bdd396c
commit 974b622c06
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
projects/swarmd/swarmd.yml
View File

@ -35,12 +35,13 @@ services:
- name: ntpd - name: ntpd
image: "linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90" image: "linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90"
- name: swarmd - 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"] command: ["/usr/bin/swarmd", "--containerd-addr=/run/containerd/containerd.sock", "--log-level=debug", "--state-dir=/var/lib/swarmd"]
capabilities: capabilities:
- all - all
pid: host pid: host
binds: binds:
- /tmp:/tmp
- /run/containerd/containerd.sock:/run/containerd/containerd.sock - /run/containerd/containerd.sock:/run/containerd/containerd.sock
- /var/lib/containerd:/var/lib/containerd - /var/lib/containerd:/var/lib/containerd
- /var/lib/swarmd:/var/lib/swarmd - /var/lib/swarmd:/var/lib/swarmd

2
projects/swarmd/swarmd/Dockerfile
View File

@ -16,7 +16,7 @@ ENV GOPATH=/root/go
# https://github.com/ijc25/swarmkit/tree/containerd-wip # https://github.com/ijc25/swarmkit/tree/containerd-wip
ENV SWARMKIT_REPO=https://github.com/ijc25/swarmkit ENV SWARMKIT_REPO=https://github.com/ijc25/swarmkit
ENV SWARMKIT_BRANCH=containerd-wip ENV SWARMKIT_BRANCH=containerd-wip
ENV SWARMKIT_COMMIT=cb429323fa86df0c279a8d629e674f79a20e01e3 ENV SWARMKIT_COMMIT=4a484ccb498bee117fe6167d5a5e7ea0f6d4f2e9
RUN mkdir -p $GOPATH/src/github.com/docker && \ RUN mkdir -p $GOPATH/src/github.com/docker && \
cd $GOPATH/src/github.com/docker && \ cd $GOPATH/src/github.com/docker && \