Skip to content
This repository has been archived by the owner on Oct 11, 2023. It is now read-only.

Commit

Permalink
I've build 1.12.6 for arm&arm64 - should try it out
Browse files Browse the repository at this point in the history
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
  • Loading branch information
SvenDowideit committed Jan 16, 2017
1 parent f4975d7 commit d2bee16
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions os-config.tpl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"]
Expand Down

0 comments on commit d2bee16

Please sign in to comment.