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

Merge pull request #2312 from mbentley/fix-compose-docker

Browse Source 
Fixed commands and resolv.conf in docker example
This commit is contained in:
Justin Cormack 2017-07-28 09:51:17 +01:00 committed by GitHub
commit f1bd7c2e4d
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/docker.yml
View File

@ -38,6 +38,7 @@ services:
- type: cgroup - type: cgroup
options: ["rw","nosuid","noexec","nodev","relatime"] options: ["rw","nosuid","noexec","nodev","relatime"]
binds: binds:
- /etc/resolv.conf:/etc/resolv.conf
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /lib/modules:/lib/modules - /lib/modules:/lib/modules
- /etc/docker/daemon.json:/etc/docker/daemon.json - /etc/docker/daemon.json:/etc/docker/daemon.json

3
projects/compose/compose-dynamic.yml
View File

@ -34,11 +34,12 @@ services:
- type: cgroup - type: cgroup
options: ["rw","nosuid","noexec","nodev","relatime"] options: ["rw","nosuid","noexec","nodev","relatime"]
binds: binds:
- /etc/resolv.conf:/etc/resolv.conf
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /lib/modules:/lib/modules - /lib/modules:/lib/modules
- /var/run:/var/run - /var/run:/var/run
- /var/html:/var/html - /var/html:/var/html
command: ["/usr/bin/docker-init", "/usr/bin/dockerd"] command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
- name: compose - name: compose
image: linuxkitprojects/compose:0535e78608f57702745dfd56fbe78d28d237e469 image: linuxkitprojects/compose:0535e78608f57702745dfd56fbe78d28d237e469
binds: binds:

3
projects/compose/compose-static.yml
View File

@ -34,11 +34,12 @@ services:
- type: cgroup - type: cgroup
options: ["rw","nosuid","noexec","nodev","relatime"] options: ["rw","nosuid","noexec","nodev","relatime"]
binds: binds:
- /etc/resolv.conf:/etc/resolv.conf
- /var/lib/docker:/var/lib/docker - /var/lib/docker:/var/lib/docker
- /lib/modules:/lib/modules - /lib/modules:/lib/modules
- /var/run:/var/run - /var/run:/var/run
- /var/html:/var/html - /var/html:/var/html
command: ["/usr/bin/docker-init", "/usr/bin/dockerd"] command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
- name: compose - name: compose
image: linuxkitprojects/compose:0535e78608f57702745dfd56fbe78d28d237e469 image: linuxkitprojects/compose:0535e78608f57702745dfd56fbe78d28d237e469
binds: binds: