Merge pull request #19 from rneugeba/docker-win

Docker win
This commit is contained in:
Justin Cormack 2016-01-28 22:26:14 +00:00
commit dd0cd8c760
2 changed files with 8 additions and 0 deletions

View File

@ -11,8 +11,13 @@ then
DATABASE="$(cat /proc/cmdline | sed -e 's/.*com.docker.database="//' -e 's/".*//')"
CONFIG_FILE="/Database/branch/master/ro/${DATABASE}/etc/docker/daemon.json"
[ -s ${CONFIG_FILE} ] && DOCKER_OPTS="${DOCKER_OPTS} --config-file ${CONFIG_FILE}"
else
# If there is no database and we run on Hyper-V start daemon
# with networking for now. This will change in the future!
[ -d /sys/bus/vmbus ] && DOCKER_OPTS="${DOCKER_OPTS} -H tcp://0.0.0.0:2375"
fi
command_args="daemon -p \"${pidfile}\" ${DOCKER_OPTS}"
DOCKER_LOGFILE="/var/log/docker.log}"

3
alpine/packages/hvtools/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
hv_fcopy_daemon
hv_kvp_daemon
hv_vss_daemon