From 77a5b0d032a6fa215e40d300c1921f6d724d75e6 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Wed, 20 Jan 2016 14:40:45 +0000 Subject: [PATCH] Use a config file from the database if present See issue https://github.com/docker/pinata/issues/690 Note there is not yet a restart mechanism. Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index 41f5f000f..c42fb4788 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -2,11 +2,10 @@ export DOCKER_RAMDISK="true" -DOCKER_OPTS="${DOCKER_OPTS:--s aufs}" +DOCKER_OPTS="${DOCKER_OPTS:- -s aufs}" command="${DOCKER_BINARY:-/usr/bin/docker}" pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}" -command_args="daemon -p \"${pidfile}\" ${DOCKER_OPTS}" if cat /proc/cmdline | grep -q 'com.docker.groupDir' then @@ -14,6 +13,15 @@ then [ -d "${GROUPDIR}" ] && DOCKER_LOGFILE="${GROUPDIR}/${RC_SVCNAME}.log" fi +if cat /proc/cmdline | grep -q 'com.docker.database' +then + DATABASE="$(cat /proc/cmdline | sed -e 's/.*com.docker.database="//' -e 's/".*//')" + CONFIGFILE="/Database/branch/master/ro/${DATABASE}/etc/docker/daemon.json" + [ -s ${CONFIGFILE} ] && DOCKER_OPTS="${DOCKER_OPTS} -config-file ${CONFIG_FILE}" +fi + +command_args="daemon -p \"${pidfile}\" ${DOCKER_OPTS}" + DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}" start_stop_daemon_args="--background \ --stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\""