From 40a3b5578acd525fc03a9618edd00005dfffe2f6 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 19 Jan 2017 14:34:29 +0000 Subject: [PATCH] Always have database at /Database Use a bind mount for OSX and Windows for 9p filesystem. This makes it easier to use a different database source, and to share database into system containers. Signed-off-by: Justin Cormack --- alpine/packages/mobyconfig/usr/bin/mobyconfig | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/alpine/packages/mobyconfig/usr/bin/mobyconfig b/alpine/packages/mobyconfig/usr/bin/mobyconfig index 5208f9916..3a39c33f1 100755 --- a/alpine/packages/mobyconfig/usr/bin/mobyconfig +++ b/alpine/packages/mobyconfig/usr/bin/mobyconfig @@ -17,26 +17,21 @@ then mkdir -p /Database case "$(mobyplatform)" in windows) - /sbin/9pmount-vsock listen db /Database + mkdir -p /tmp/db + /sbin/9pmount-vsock listen db /tmp/db [ $? -ne 0 ] && rm -rf /Database && printf "Could not mount configuration database\n" 1>&2 && exit 1 + mount --bind /tmp/db/branch/master/ro/com.docker.driver.amd64-linux /Database ;; mac) - mount -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 db /Database + mkdir -p /tmp/db + mount -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 db /tmp/db [ $? -ne 0 ] && rm -rf /Database && printf "Could not mount configuration database\n" 1>&2 && exit 1 + mount --bind /tmp/db/branch/master/ro/com.docker.driver.amd64-linux /Database ;; esac fi -case "$(mobyplatform)" in - windows|mac) - DATABASE="com.docker.driver.amd64-linux" - BASE="/Database/branch/master/ro/${DATABASE}" - ;; - *) - # For other editions, currently all database keys will be reported as empty. - # Later they will build a tree from other sources. - BASE="/Database" -esac +BASE=/Database KEY=$(echo $2 | sed 's@^/@@')