github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-30 05:51:26 +00:00
Code Issues Projects Releases Wiki Activity

allow use of any files under /etc/docker eg /etc/docker/certs.d/

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-04-08 13:28:15 +01:00
parent a60e4c92c8
commit 32c895765f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/packages/docker/etc/init.d/docker
View File

@ -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