rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-31 22:47:16 +00:00
Code Issues Releases Wiki Activity

Move to using Docker 17.03.1-CE by default

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-04-12 03:08:34 +00:00
parent 34a0f29b7f
commit 3900bc385e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -37,9 +37,11 @@ clean:
release: release-build openstack
release-build:
mkdir -p dist
./.dapper release 2>&1 | tee dist/release.log
itest:
mkdir -p dist
./.dapper integration-test 2>&1 | tee dist/itest.log
openstack:

6
os-config.tpl.yml
View File

@ -6,7 +6,7 @@ rancher:
hostname: {{.HOSTNAME_DEFAULT}}
{{if eq "amd64" .ARCH -}}
docker:
engine: docker-1.12.6
engine: docker-17.03.1-ce
{{else -}}
docker:
engine: docker-1.11.2
@ -294,7 +294,7 @@ rancher:
- /opt:/opt
docker:
{{if eq "amd64" .ARCH -}}
image: {{.OS_REPO}}/os-docker:1.12.6{{.SUFFIX}}
image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}}
{{else -}}
image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
{{end -}}
@ -336,7 +336,7 @@ rancher:
image: {{.OS_REPO}}/os
docker:
{{if eq "amd64" .ARCH -}}
engine: docker-1.12.6
engine: docker-17.03.1-ce
{{else -}}
engine: docker-1.11.2
{{end -}}