From 4f6641ff8c51122e4d7d2d8e2602b45ed84874d8 Mon Sep 17 00:00:00 2001 From: David Scott Date: Sun, 3 Apr 2016 19:58:04 +0100 Subject: [PATCH] docker: if network=slirp or native/port-forwarding=true, forward ports Signed-off-by: David Scott --- alpine/packages/docker/etc/init.d/docker | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index aa6ba89d8..d0e77332f 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -41,8 +41,14 @@ start() if cat /proc/cmdline | grep -q 'com.docker.database' then DATABASE="$(cat /proc/cmdline | sed -e 's/.*com.docker.database="//' -e 's/".*//')" - CONFIG_FILE="/Database/branch/master/ro/${DATABASE}/etc/docker/daemon.json" + 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:]]')" + if [ "${NETWORK_MODE}" = "slirp" -o "${NATIVE_PORT_FORWARDING}" = "true" ]; then + DOCKER_OPTS="${DOCKER_OPTS} --userland-proxy-bin /sbin/proxy" + fi fi for d in Users Volumes tmp private