1
0
mirror of https://github.com/rancher/os.git synced 2025-08-24 09:28:14 +00:00

Revert "I've build 1.12.6 for arm&arm64 - should try it out"

This commit is contained in:
Sven Dowideit 2017-01-18 22:09:46 +10:00
parent ac761a3973
commit 1be5c6c527

View File

@ -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"]