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

Switch default Docker version to 1.12.0

Browse Source
This commit is contained in:
Josh Curl 2016-08-18 16:44:50 -07:00
parent add2080fb2
commit 4edba20d24
No known key found for this signature in database
GPG Key ID: 82B504B9BCCFA677
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.tpl.yml
View File

@ -5,7 +5,7 @@ rancher:
defaults:
hostname: {{.HOSTNAME_DEFAULT}}
docker:
engine: docker-1.11.2
engine: docker-1.12.0
network:
dns:
nameservers: [8.8.8.8, 8.8.4.4]
@ -357,7 +357,7 @@ rancher:
- /home:/home
- /opt:/opt
docker:
image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
image: {{.OS_REPO}}/os-docker:1.12.0{{.SUFFIX}}
command: /usr/bin/user-docker
environment:
- HTTP_PROXY
@ -384,7 +384,7 @@ rancher:
url: {{.OS_RELEASES_YML}}/releases{{.SUFFIX}}.yml
image: {{.OS_REPO}}/os
docker:
engine: docker-1.11.2
engine: docker-1.12.0
tls_args: [--tlsverify, --tlscacert=/etc/docker/tls/ca.pem, --tlscert=/etc/docker/tls/server-cert.pem, --tlskey=/etc/docker/tls/server-key.pem,
'-H=0.0.0.0:2376']
args: [daemon, --log-opt, max-size=25m, --log-opt, max-file=2, -s, overlay, -G, docker, -H, 'unix:///var/run/docker.sock']