From 1be5c6c527b595773759e14e5d38e6be8db75aa5 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 18 Jan 2017 22:09:46 +1000 Subject: [PATCH] Revert "I've build 1.12.6 for arm&arm64 - should try it out" --- os-config.tpl.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/os-config.tpl.yml b/os-config.tpl.yml index da5ea61e..05d12c3d 100644 --- a/os-config.tpl.yml +++ b/os-config.tpl.yml @@ -6,8 +6,13 @@ rancher: SUFFIX: {{.SUFFIX}} defaults: hostname: {{.HOSTNAME_DEFAULT}} + {{if eq "amd64" .ARCH -}} docker: engine: docker-1.12.6 + {{else -}} + docker: + engine: docker-1.11.2 + {{end -}} network: dns: nameservers: [8.8.8.8, 8.8.4.4] @@ -276,7 +281,11 @@ rancher: - /home:/home - /opt:/opt docker: + {{if eq "amd64" .ARCH -}} image: {{.OS_REPO}}/os-docker:1.12.6{{.SUFFIX}} + {{else -}} + image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}} + {{end -}} command: ros user-docker environment: - HTTP_PROXY @@ -314,7 +323,11 @@ rancher: url: {{.OS_RELEASES_YML}}/releases{{.SUFFIX}}.yml image: {{.OS_REPO}}/os docker: + {{if eq "amd64" .ARCH -}} engine: docker-1.12.6 + {{else -}} + engine: docker-1.11.2 + {{end -}} storage_driver: overlay group: docker host: ["unix:///var/run/docker.sock"]