diff --git a/os-config.tpl.yml b/os-config.tpl.yml index 51be8a8d..b44df7b5 100644 --- a/os-config.tpl.yml +++ b/os-config.tpl.yml @@ -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']