From 5847bb7eb16b1b01298dbb92ea16c31ac540e5bd Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 8 Apr 2016 13:14:19 +0100 Subject: [PATCH] more uses of moobyconfig in docker config Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 8b2ed52dd..122895b40 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -38,14 +38,14 @@ start() # future change this to use a hypervisor socket. DOCKER_OPTS="${DOCKER_OPTS} -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock" - if cat /proc/cmdline | grep -q 'com.docker.database' + if mobyconfig exists etc/docker/daemon.json + then + DOCKER_OPTS="${DOCKER_OPTS} --config-file $(mobyconfig path etc/docker/daemon.json)" + fi + if mobyconfig exists network then - DATABASE="$(cat /proc/cmdline | sed -e 's/.*com.docker.database="//' -e 's/".*//')" - MASTER_RO="/Database/branch/master/ro" - CONFIG_FILE="${MASTER_RO}/${DATABASE}/etc/docker/daemon.json" - [ -s ${CONFIG_FILE} ] && DOCKER_OPTS="${DOCKER_OPTS} --config-file ${CONFIG_FILE}" NETWORK_MODE="$(mobyconfig get network | tr -d '[[:space:]]')" - NATIVE_PORT_FORWARDING="$(mobyconfig native/port-forwarding | tr -d '[[:space:]]')" + NATIVE_PORT_FORWARDING="$(mobyconfig get native/port-forwarding | tr -d '[[:space:]]')" if [ "${NETWORK_MODE}" = "slirp" -o "${NATIVE_PORT_FORWARDING}" = "true" ]; then DOCKER_OPTS="${DOCKER_OPTS} --userland-proxy-bin /sbin/proxy" fi