From eaed4da0beb75a07492c8d4f68236f580dfba354 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Wed, 4 Nov 2015 14:48:07 +0500 Subject: [PATCH] update to docker-1.9.0 --- Dockerfile.build-base | 2 +- build.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.build-base b/Dockerfile.build-base index 63b44af7..2754fe34 100644 --- a/Dockerfile.build-base +++ b/Dockerfile.build-base @@ -8,7 +8,7 @@ RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 ENV TERM xterm -RUN curl -sL https://get.docker.com/builds/Linux/x86_64/docker-1.8.2 > /usr/bin/docker +RUN curl -sL https://get.docker.com/builds/Linux/x86_64/docker-1.8.3 > /usr/bin/docker RUN chmod +x /usr/bin/docker RUN pip install tox diff --git a/build.conf b/build.conf index 44f1a13a..35e56e3a 100644 --- a/build.conf +++ b/build.conf @@ -1,6 +1,6 @@ IMAGE_NAME=rancher/os VERSION=v0.4.1-dev -DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.8.3-ros2/docker-1.8.3 +DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.9.0-ros1/docker-1.9.0 COMPILED_KERNEL_URL=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.2.0-16.19/linux-4.2.3-rancher-x86.tar.gz -DFS_IMAGE=rancher/docker:1.8.3 +DFS_IMAGE=rancher/docker:1.9.0-1