1
0
mirror of https://github.com/rancher/os.git synced 2025-07-07 03:48:38 +00:00

Merge pull request #489 from imikushin/tweak-container-logging

tweak container rollover logging options
This commit is contained in:
Darren Shepherd 2015-08-13 22:25:46 -07:00
commit cec769904f

View File

@ -270,7 +270,7 @@ rancher:
- /home:/home - /home:/home
- /opt:/opt - /opt:/opt
system_docker: system_docker:
args: [daemon, --log-opt, max-size=10m, --log-opt, max-file=10, -s, overlay, -b, docker-sys, args: [daemon, --log-opt, max-size=25m, --log-opt, max-file=2, -s, overlay, -b, docker-sys,
--fixed-cidr, 172.18.42.1/16, --restart=false, -g, /var/lib/system-docker, -G, root, --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] -H, 'unix:///var/run/system-docker.sock', --userland-proxy=false]
upgrade: upgrade:
@ -279,4 +279,4 @@ rancher:
user_docker: user_docker:
tls_args: [--tlsverify, --tlscacert=ca.pem, --tlscert=server-cert.pem, --tlskey=server-key.pem, tls_args: [--tlsverify, --tlscacert=ca.pem, --tlscert=server-cert.pem, --tlskey=server-key.pem,
'-H=0.0.0.0:2376'] '-H=0.0.0.0:2376']
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] args: [daemon, --log-opt, max-size=25m, --log-opt, max-file=2, -s, overlay, -G, docker, -H, 'unix:///var/run/docker.sock', --userland-proxy=false]