rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-02 07:24:28 +00:00
Code Issues Releases Wiki Activity

Support debian style /etc/default/docker at /var/lib/rancher/conf/docker

Browse Source
This commit is contained in:
Darren Shepherd 2015-05-02 23:07:28 -07:00
parent 420d3290c8
commit 4367c93aa3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/dockerimages/scripts/docker.sh
View File

@ -27,4 +27,8 @@ if [ "$(rancherctl config get user_docker.tls)" = "true" ]; then
cd $TLS_PATH
fi
exec $ARGS >/var/log/docker.log 2>&1
if [ -e /var/lib/rancher/conf/docker ]; then
source /var/lib/rancher/conf/docker
fi
exec $ARGS $DOCKER_OPTS >/var/log/docker.log 2>&1