github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 16:21:53 +00:00
Code Issues Projects Releases Wiki Activity

docker-for-mac: use runtime: mkdir

Browse Source 
This replaces an alpine container which existed only to run the `mkdir`.

Signed-off-by: David Scott <dave.scott@docker.com>
This commit is contained in:
David Scott
2017-08-29 13:25:39 +01:00
parent c29b433780
commit af5761d6b5
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
blueprints/docker-for-mac/base.yml
View File

@@ -24,12 +24,6 @@ onboot:
- name: mount - name: mount
image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08 image: linuxkit/mount:4fe245efb01384e42622c36302e13e386bbaeb08
command: ["/usr/bin/mountie", "/var/lib"] command: ["/usr/bin/mountie", "/var/lib"]
# create docker dir on mounted drive if it doesn't exist
- name: mkdir-docker
image: alpine:3.6
binds:
- /var/lib:/host_var_lib
command: ["sh", "-c", "mkdir -p /host_var_lib/docker"]
# mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding # mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding
- name: mount-vpnkit - name: mount-vpnkit
image: alpine:3.6 image: alpine:3.6

2
blueprints/docker-for-mac/docker-ce.yml
View File

@@ -23,6 +23,8 @@ services:
"--swarm-default-advertise-addr=eth0", "--swarm-default-advertise-addr=eth0",
"--userland-proxy-path", "/usr/bin/vpnkit-expose-port", "--userland-proxy-path", "/usr/bin/vpnkit-expose-port",
"--storage-driver", "overlay2" ] "--storage-driver", "overlay2" ]
runtime:
mkdir: ["/var/lib/docker"]
trust: trust:
org: org:
- library - library