From 713af4332b0be1bf0918a74337c9a9e255d37905 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 11 Apr 2016 11:09:55 +0100 Subject: [PATCH] clean up config options Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index ade7423b9..c86ae24ee 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -38,6 +38,7 @@ 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" + # some config is always in /etc/docker cannot specify alternative eg certs if mobyconfig exists etc/docker then for f in $(mobyconfig find etc/docker) @@ -45,6 +46,12 @@ start() mkdir -p $(dirname $f) mobyconfig get $f > $f done + rm -f /etc/docker/daemon.json + fi + # leave in same place as we have a watch + 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