From 9f4ffef125761ea7b43b93c6de285d89ecdab58e Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Fri, 11 Nov 2016 00:21:03 +0000 Subject: [PATCH] Start on 0.7.1 release of amd64 Signed-off-by: Sven Dowideit --- Dockerfile.dapper | 2 +- README.md | 2 +- os-config.tpl.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index b820af19..1c7ec7fc 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -55,7 +55,7 @@ ARG DOCKER_BUILD_VERSION=1.10.3 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 KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.4.0-42.62-rancher1-1/linux-4.4.21-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 DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz diff --git a/README.md b/README.md index db6d9609..88cfe68c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet ## Latest Release -**v0.7.1 - Docker 1.12.3** +**v0.7.1 - Docker 1.12.3 - Linux 4.4.24** ### ISO diff --git a/os-config.tpl.yml b/os-config.tpl.yml index eb30e607..5648bc61 100644 --- a/os-config.tpl.yml +++ b/os-config.tpl.yml @@ -6,7 +6,7 @@ rancher: hostname: {{.HOSTNAME_DEFAULT}} {{if eq "amd64" .ARCH -}} docker: - engine: docker-1.12.1 + engine: docker-1.12.3 {{else -}} docker: engine: docker-1.11.2 @@ -308,7 +308,7 @@ rancher: - /opt:/opt docker: {{if eq "amd64" .ARCH -}} - image: {{.OS_REPO}}/os-docker:1.12.1{{.SUFFIX}} + image: {{.OS_REPO}}/os-docker:1.12.3{{.SUFFIX}} {{else -}} image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}} {{end -}} @@ -350,7 +350,7 @@ rancher: image: {{.OS_REPO}}/os docker: {{if eq "amd64" .ARCH -}} - engine: docker-1.12.1 + engine: docker-1.12.3 {{else -}} engine: docker-1.11.2 {{end -}}