1
0
mirror of https://github.com/rancher/os.git synced 2025-08-14 21:15:15 +00:00

use 4.4.24 ubuntu kernel and docker 1.12.3

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2016-11-11 03:40:30 +00:00
parent 3ac0c42ffe
commit d9605c5302
3 changed files with 5 additions and 5 deletions

View File

@ -53,7 +53,7 @@ ARG DOCKER_BUILD_VERSION=1.10.3
ARG DOCKER_BUILD_PATCH_VERSION=v${DOCKER_BUILD_VERSION}-ros1 ARG DOCKER_BUILD_PATCH_VERSION=v${DOCKER_BUILD_VERSION}-ros1
ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.3/policy.29 ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.3/policy.29
ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.4.0-48.69-rancher1/linux-4.4.30-rancher-x86.tar.gz ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.4.0-47.68-rancher1/linux-4.4.24-rancher-x86.tar.gz
ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.4.0-arm64.8/linux-4.4.0-rancher-arm64.tar.gz ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.4.0-arm64.8/linux-4.4.0-rancher-arm64.tar.gz
ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz

View File

@ -14,7 +14,7 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet
## Latest Release ## Latest Release
**v0.7.1 - Docker 1.12.1 - Linux 4.4.19** **v0.7.1 - Docker 1.12.3 - Linux 4.4.24**
### ISO ### ISO

View File

@ -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.1 engine: docker-1.12.3
{{else -}} {{else -}}
docker: docker:
engine: docker-1.11.2 engine: docker-1.11.2
@ -373,7 +373,7 @@ rancher:
- /opt:/opt - /opt:/opt
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
image: {{.OS_REPO}}/os-docker:1.12.1{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:1.12.3{{.SUFFIX}}
{{else -}} {{else -}}
image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}}
{{end -}} {{end -}}
@ -415,7 +415,7 @@ rancher:
image: {{.OS_REPO}}/os image: {{.OS_REPO}}/os
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
engine: docker-1.12.1 engine: docker-1.12.3
{{else -}} {{else -}}
engine: docker-1.11.2 engine: docker-1.11.2
{{end -}} {{end -}}