From 20eaf62df14cd56e1b60b7b3c53d9120bfbf5f62 Mon Sep 17 00:00:00 2001 From: Magnus Skjegstad Date: Mon, 10 Jul 2017 15:22:47 +0100 Subject: [PATCH 1/2] blueprints: only bind mount /port once in dfm blueprint Signed-off-by: Magnus Skjegstad --- blueprints/docker-for-mac/docker-17.06-ce.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/blueprints/docker-for-mac/docker-17.06-ce.yml b/blueprints/docker-for-mac/docker-17.06-ce.yml index dc18268af..3d64257b1 100644 --- a/blueprints/docker-for-mac/docker-17.06-ce.yml +++ b/blueprints/docker-for-mac/docker-17.06-ce.yml @@ -13,7 +13,6 @@ services: binds: - /var/lib/docker:/var/lib/docker - /lib/modules:/lib/modules - - /var/vpnkit:/port - /var/vpnkit:/port # vpnkit control 9p mount - /var/run:/var/run - /var/config/docker:/var/config/docker From 9daca681a173c95ccc5d5d45191118c24afa40a8 Mon Sep 17 00:00:00 2001 From: Magnus Skjegstad Date: Mon, 10 Jul 2017 16:03:08 +0100 Subject: [PATCH 2/2] blueprints, dfm: move logs, mount disk in /var/lib This mounts the disk image in /var/lib (instead of /var/lib/docker) and moves the logs to /var/lib/log. This is to have the logs on disk until we have a better solution in place. Signed-off-by: Magnus Skjegstad --- blueprints/docker-for-mac/base.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index fb6519947..4e1b2c3d7 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -22,7 +22,13 @@ onboot: image: linuxkit/format:84a997e69051a1bf05b7c1926ab785bb07932954 - name: mount image: linuxkit/mount:b24bd97ae43397b469dbaadd80f17f291c817bdf - command: ["/mount.sh", "/var/lib/docker"] + command: ["/mount.sh", "/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 - name: mount-vpnkit image: alpine:3.6 @@ -32,6 +38,12 @@ onboot: - CAP_SYS_ADMIN rootfsPropagation: shared command: ["sh", "-c", "mkdir -p /host_var/vpnkit/port && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] + # move logs to the mounted disk (this is a temporary fix until we can limit the log sizes) + - name: move-logs + image: alpine:3.6 + binds: + - /var:/host_var + command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] - name: dhcpcd image: linuxkit/dhcpcd:4b7b8bb024cebb1bbb9c8026d44d7cbc8e202c41 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]