From d2bee1605826c88796198adeadb2eb9a075a3ad9 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Sat, 14 Jan 2017 10:59:34 +0000 Subject: [PATCH] I've build 1.12.6 for arm&arm64 - should try it out Signed-off-by: Sven Dowideit --- os-config.tpl.yml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/os-config.tpl.yml b/os-config.tpl.yml index 7ad2606e..bcf12425 100644 --- a/os-config.tpl.yml +++ b/os-config.tpl.yml @@ -4,13 +4,8 @@ rancher: SUFFIX: {{.SUFFIX}} defaults: hostname: {{.HOSTNAME_DEFAULT}} - {{if eq "amd64" .ARCH -}} docker: - engine: docker-1.12.3 - {{else -}} - docker: - engine: docker-1.11.2 - {{end -}} + engine: docker-1.12.6 network: dns: nameservers: [8.8.8.8, 8.8.4.4] @@ -279,11 +274,7 @@ rancher: - /home:/home - /opt:/opt docker: - {{if eq "amd64" .ARCH -}} - image: {{.OS_REPO}}/os-docker:1.12.3{{.SUFFIX}} - {{else -}} - image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}} - {{end -}} + image: {{.OS_REPO}}/os-docker:1.12.6{{.SUFFIX}} command: ros user-docker environment: - HTTP_PROXY @@ -321,11 +312,7 @@ rancher: url: {{.OS_RELEASES_YML}}/releases{{.SUFFIX}}.yml image: {{.OS_REPO}}/os docker: - {{if eq "amd64" .ARCH -}} - engine: docker-1.12.3 - {{else -}} - engine: docker-1.11.2 - {{end -}} + engine: docker-1.12.6 storage_driver: overlay group: docker host: ["unix:///var/run/docker.sock"]