Merge pull request #1486 from ijc25/swarmd

swarmd: use standard init
This commit is contained in:
Rolf Neugebauer 2017-04-04 16:45:05 +01:00 committed by GitHub
commit 8225f34631
2 changed files with 4 additions and 2 deletions

View File

@ -1,7 +1,7 @@
kernel: kernel:
image: "mobylinux/kernel:4.9.x" image: "mobylinux/kernel:4.9.x"
cmdline: "console=ttyS0 console=tty0 page_poison=1" cmdline: "console=ttyS0 console=tty0 page_poison=1"
init: "mobylinux/init:1ceddd8914f233fdc8a2c2f1de9569bb3a562a52" init: "mobylinux/init:00c3a5bbfd9794f4a3187fcc4a9f0c826c46d474"
system: system:
- name: sysctl - name: sysctl
image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
@ -46,7 +46,6 @@ daemon:
- /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
- /etc/resolv.conf:/etc/resolv.conf - /etc/resolv.conf:/etc/resolv.conf
- /etc/ssl:/etc/ssl
files: files:
- path: etc/docker/daemon.json - path: etc/docker/daemon.json
contents: '{"debug": true}' contents: '{"debug": true}'

3
projects/swarmd/swarmd/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
hash
swarmd.tag
swarmd.tar