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

Merge pull request #186 from justincormack/configsimplify

Browse Source 
remove special treatment of /etc/docker/daemon.conf as we no longer h…
This commit is contained in:
Justin Cormack 2016-06-08 13:48:40 +01:00
commit d30636d93e
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,12 +25,6 @@ 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