rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-10 11:03:16 +00:00
Code Issues Releases Wiki Activity

Bump user-docker to 18.06.1

Browse Source
This commit is contained in:
niusmallnan 2018-11-15 16:24:00 +08:00
parent 48b77a7e70
commit cb572edfc5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os-config.tpl.yml
View File

@ -8,10 +8,10 @@ rancher:
hostname: {{.HOSTNAME_DEFAULT}} hostname: {{.HOSTNAME_DEFAULT}}
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
docker: docker:
engine: docker-18.03.1-ce engine: docker-18.06.1-ce
{{else -}} {{else -}}
docker: docker:
engine: docker-18.03.1-ce engine: docker-18.06.1-ce
{{end -}} {{end -}}
network: network:
dhcp_timeout: 10 dhcp_timeout: 10
@ -349,9 +349,9 @@ rancher:
- system-volumes - system-volumes
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
image: {{.OS_REPO}}/os-docker:18.03.1{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:18.06.1{{.SUFFIX}}
{{else -}} {{else -}}
image: {{.OS_REPO}}/os-docker:18.03.1{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:18.06.1{{.SUFFIX}}
{{end -}} {{end -}}
command: ros user-docker command: ros user-docker
environment: environment:
@ -392,9 +392,9 @@ rancher:
image: {{.OS_REPO}}/os image: {{.OS_REPO}}/os
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
engine: docker-18.03.1-ce engine: docker-18.06.1-ce
{{else -}} {{else -}}
engine: docker-18.03.1-ce engine: docker-18.06.1-ce
{{end -}} {{end -}}
group: docker group: docker
host: ["unix:///var/run/docker.sock"] host: ["unix:///var/run/docker.sock"]