From 64b16c1dc3f5ab576731832cc4f0c813fd4891ab Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 8 Apr 2016 13:06:55 +0100 Subject: [PATCH] use mobyconfig some more in docker config Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 07a8e17cf..8b2ed52dd 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -44,8 +44,8 @@ start() 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="$(cat ${MASTER_RO}/${DATABASE}/network | tr -d '[[:space:]]')" - NATIVE_PORT_FORWARDING="$(cat ${MASTER_RO}/${DATABASE}/native/port-forwarding | tr -d '[[:space:]]')" + NETWORK_MODE="$(mobyconfig get network | tr -d '[[:space:]]')" + NATIVE_PORT_FORWARDING="$(mobyconfig 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