rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-07 03:48:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #485 from imikushin/docker-daemon-params

Browse Source 
update docker daemon params
This commit is contained in:
Darren Shepherd 2015-08-13 14:33:57 -07:00
commit 0e05d1b344
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os-config.yml
View File

@ -270,8 +270,8 @@ rancher:
- /home:/home
- /opt:/opt
system_docker:
args: [-d, -s, overlay, -b, docker-sys, --fixed-cidr, 172.18.42.1/16,
--restart=false, -g, /var/lib/system-docker, -G, root,
args: [daemon, --log-opt, max-size=10m, --log-opt, max-file=10, -s, overlay, -b, docker-sys,
--fixed-cidr, 172.18.42.1/16, --restart=false, -g, /var/lib/system-docker, -G, root,
-H, 'unix:///var/run/system-docker.sock', --userland-proxy=false]
upgrade:
url: https://releases.rancher.com/os/versions.yml
@ -279,4 +279,4 @@ rancher:
user_docker:
tls_args: [--tlsverify, --tlscacert=ca.pem, --tlscert=server-cert.pem, --tlskey=server-key.pem,
'-H=0.0.0.0:2376']
args: [-d, -s, overlay, -G, docker, -H, 'unix:///var/run/docker.sock', --userland-proxy=false]
args: [daemon, --log-opt, max-size=10m, --log-opt, max-file=10, -s, overlay, -G, docker, -H, 'unix:///var/run/docker.sock', --userland-proxy=false]