Merge pull request #2235 from justincormack/use-library-docker

Use the upstream dind package to run docker
This commit is contained in:
Justin Cormack
2017-07-18 17:27:45 +01:00
committed by GitHub
10 changed files with 20 additions and 66 deletions

View File

@@ -30,7 +30,7 @@ services:
- name: ntpd
image: linuxkit/openntpd:19370f5d9bec84eb91073b7196b732f1301d9c90
- name: docker
image: linuxkit/docker-ce:9b937df179bdbebbc70243779978057df0b54190
image: docker:17.06.0-ce-dind
capabilities:
- all
net: host
@@ -41,6 +41,7 @@ services:
- /var/lib/docker:/var/lib/docker
- /lib/modules:/lib/modules
- /etc/docker/daemon.json:/etc/docker/daemon.json
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
files:
- path: var/lib/docker
directory: true
@@ -49,3 +50,4 @@ files:
trust:
org:
- linuxkit
- library