From 32c895765f9d93540094057043543d0bc3af4d7e Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 8 Apr 2016 13:28:15 +0100 Subject: [PATCH] allow use of any files under /etc/docker eg /etc/docker/certs.d/ 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 122895b40..f139a5aa4 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -38,9 +38,9 @@ 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" - if mobyconfig exists etc/docker/daemon.json + if mobyconfig exists etc/docker then - DOCKER_OPTS="${DOCKER_OPTS} --config-file $(mobyconfig path etc/docker/daemon.json)" + cp -a $(mobyconfig path etc/docker)/* /etc/docker/ fi if mobyconfig exists network then