rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-06-30 00:31:49 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1511 from SvenDowideit/use-1.12.6-everywhere

Browse Source 
I've build 1.12.6 for arm&arm64 - should try it out
This commit is contained in:
Sven Dowideit 2017-01-16 15:34:25 +10:00 committed by GitHub
commit cbac292e4d
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
os-config.tpl.yml
View File

@ -4,13 +4,8 @@ rancher:
SUFFIX: {{.SUFFIX}} SUFFIX: {{.SUFFIX}}
defaults: defaults:
hostname: {{.HOSTNAME_DEFAULT}} hostname: {{.HOSTNAME_DEFAULT}}
{{if eq "amd64" .ARCH -}}
docker: docker:
engine: docker-1.12.3 engine: docker-1.12.6
{{else -}}
docker:
engine: docker-1.11.2
{{end -}}
network: network:
dns: dns:
nameservers: [8.8.8.8, 8.8.4.4] nameservers: [8.8.8.8, 8.8.4.4]
@ -279,11 +274,7 @@ rancher:
- /home:/home - /home:/home
- /opt:/opt - /opt:/opt
docker: docker:
{{if eq "amd64" .ARCH -}} image: {{.OS_REPO}}/os-docker:1.12.6{{.SUFFIX}}
image: {{.OS_REPO}}/os-docker:1.12.3{{.SUFFIX}}
{{else -}}
image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
{{end -}}
command: ros user-docker command: ros user-docker
environment: environment:
- HTTP_PROXY - HTTP_PROXY
@ -321,11 +312,7 @@ rancher:
url: {{.OS_RELEASES_YML}}/releases{{.SUFFIX}}.yml url: {{.OS_RELEASES_YML}}/releases{{.SUFFIX}}.yml
image: {{.OS_REPO}}/os image: {{.OS_REPO}}/os
docker: docker:
{{if eq "amd64" .ARCH -}} engine: docker-1.12.6
engine: docker-1.12.3
{{else -}}
engine: docker-1.11.2
{{end -}}
storage_driver: overlay storage_driver: overlay
group: docker group: docker
host: ["unix:///var/run/docker.sock"] host: ["unix:///var/run/docker.sock"]