rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-26 18:29:06 +00:00
Code Issues Releases Wiki Activity

Use docker-17.06.2-ce as default user docker

Browse Source
This commit is contained in:
niusmallnan 2017-12-15 11:07:07 +08:00
parent 47195af80a
commit f87dc8078a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os-config.tpl.yml
View File

@ -7,7 +7,7 @@ rancher:
hostname: {{.HOSTNAME_DEFAULT}} hostname: {{.HOSTNAME_DEFAULT}}
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
docker: docker:
engine: docker-17.03.2-ce engine: docker-17.06.2-ce
{{else -}} {{else -}}
docker: docker:
engine: docker-17.03.1-ce engine: docker-17.03.1-ce
@ -332,7 +332,7 @@ rancher:
- /var/lib/kubelet:/var/lib/kubelet - /var/lib/kubelet:/var/lib/kubelet
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
image: {{.OS_REPO}}/os-docker:17.03.2{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:17.06.2{{.SUFFIX}}
{{else -}} {{else -}}
image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}}
{{end -}} {{end -}}
@ -374,7 +374,7 @@ rancher:
image: {{.OS_REPO}}/os image: {{.OS_REPO}}/os
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
engine: docker-17.03.2-ce engine: docker-17.06.2-ce
{{else -}} {{else -}}
engine: docker-17.03.1-ce engine: docker-17.03.1-ce
{{end -}} {{end -}}