mirror of
https://github.com/rancher/os.git
synced 2025-08-10 02:58:15 +00:00
Move to using Docker 17.03.1-CE by default
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
parent
34a0f29b7f
commit
3900bc385e
2
Makefile
2
Makefile
@ -37,9 +37,11 @@ clean:
|
|||||||
release: release-build openstack
|
release: release-build openstack
|
||||||
|
|
||||||
release-build:
|
release-build:
|
||||||
|
mkdir -p dist
|
||||||
./.dapper release 2>&1 | tee dist/release.log
|
./.dapper release 2>&1 | tee dist/release.log
|
||||||
|
|
||||||
itest:
|
itest:
|
||||||
|
mkdir -p dist
|
||||||
./.dapper integration-test 2>&1 | tee dist/itest.log
|
./.dapper integration-test 2>&1 | tee dist/itest.log
|
||||||
|
|
||||||
openstack:
|
openstack:
|
||||||
|
@ -6,7 +6,7 @@ rancher:
|
|||||||
hostname: {{.HOSTNAME_DEFAULT}}
|
hostname: {{.HOSTNAME_DEFAULT}}
|
||||||
{{if eq "amd64" .ARCH -}}
|
{{if eq "amd64" .ARCH -}}
|
||||||
docker:
|
docker:
|
||||||
engine: docker-1.12.6
|
engine: docker-17.03.1-ce
|
||||||
{{else -}}
|
{{else -}}
|
||||||
docker:
|
docker:
|
||||||
engine: docker-1.11.2
|
engine: docker-1.11.2
|
||||||
@ -294,7 +294,7 @@ rancher:
|
|||||||
- /opt:/opt
|
- /opt:/opt
|
||||||
docker:
|
docker:
|
||||||
{{if eq "amd64" .ARCH -}}
|
{{if eq "amd64" .ARCH -}}
|
||||||
image: {{.OS_REPO}}/os-docker:1.12.6{{.SUFFIX}}
|
image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}}
|
||||||
{{else -}}
|
{{else -}}
|
||||||
image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
|
image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
|
||||||
{{end -}}
|
{{end -}}
|
||||||
@ -336,7 +336,7 @@ rancher:
|
|||||||
image: {{.OS_REPO}}/os
|
image: {{.OS_REPO}}/os
|
||||||
docker:
|
docker:
|
||||||
{{if eq "amd64" .ARCH -}}
|
{{if eq "amd64" .ARCH -}}
|
||||||
engine: docker-1.12.6
|
engine: docker-17.03.1-ce
|
||||||
{{else -}}
|
{{else -}}
|
||||||
engine: docker-1.11.2
|
engine: docker-1.11.2
|
||||||
{{end -}}
|
{{end -}}
|
||||||
|
Loading…
Reference in New Issue
Block a user