mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-23 19:05:37 +00:00
clean up config options
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
parent
9be06ba517
commit
713af4332b
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user