rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-31 06:32:09 +00:00
Code Issues Releases Wiki Activity

Use Docker 1.11.2 as default for arm and arm64

Browse Source
This commit is contained in:
Josh Curl 2016-08-26 11:23:34 -07:00
parent f64314b82f
commit c54da1924b
No known key found for this signature in database
GPG Key ID: 82B504B9BCCFA677
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os-config.tpl.yml
View File

@ -4,8 +4,13 @@ rancher:
SUFFIX: {{.SUFFIX}}
defaults:
hostname: {{.HOSTNAME_DEFAULT}}
{{if eq "amd64" .ARCH -}}
docker:
engine: docker-1.12.1
{{else -}}
docker:
engine: docker-1.11.2
{{end -}}
network:
dns:
nameservers: [8.8.8.8, 8.8.4.4]
@ -359,7 +364,11 @@ rancher:
- /home:/home
- /opt:/opt
docker:
{{if eq "amd64" .ARCH -}}
image: {{.OS_REPO}}/os-docker:1.12.1{{.SUFFIX}}
{{else -}}
image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
{{end -}}
command: /usr/bin/user-docker
environment:
- HTTP_PROXY
@ -386,7 +395,11 @@ rancher:
url: {{.OS_RELEASES_YML}}/releases{{.SUFFIX}}.yml
image: {{.OS_REPO}}/os
docker:
{{if eq "amd64" .ARCH -}}
engine: docker-1.12.1
{{else -}}
engine: docker-1.11.2
{{end -}}
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']