github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 11:44:44 +00:00
Code Issues Projects Releases Wiki Activity

clean up config options

Browse Source 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-04-11 11:09:55 +01:00
parent 9be06ba517
commit 713af4332b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ start()
# future change this to use a hypervisor socket. # 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" 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 if mobyconfig exists etc/docker
then then
for f in $(mobyconfig find etc/docker) for f in $(mobyconfig find etc/docker)
@ -45,6 +46,12 @@ start()
mkdir -p $(dirname $f) mkdir -p $(dirname $f)
mobyconfig get $f > $f mobyconfig get $f > $f
done 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 fi
if mobyconfig exists network if mobyconfig exists network
then then