From 32aa3c74a56ef07fa20f110f899c88322719fa2c Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Fri, 7 Aug 2015 23:25:38 +0500 Subject: [PATCH 1/2] rm copy-images --- scripts/copy-images | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100755 scripts/copy-images diff --git a/scripts/copy-images b/scripts/copy-images deleted file mode 100755 index 82e9cc4a..00000000 --- a/scripts/copy-images +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -ex - -cd $(dirname $0)/.. - -. scripts/build-common -. scripts/version - -VERSION=${VERSION:?"VERSION not set"} -BUILD=${BUILD:?"BUILD not set"} - - -CONTAINER_KERNEL=$(docker create rancher/os-kernel:${VERSION}) -cleanup_kernel() { - docker rm -v ${CONTAINER_KERNEL} -} -trap cleanup_kernel EXIT - -docker cp ${CONTAINER_KERNEL}:/kernel ${BUILD} # copies files to ${BUILD}/kernel From 721ab4dae865d04eddbefce28a7244c4d478a90f Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Mon, 10 Aug 2015 19:28:43 +0500 Subject: [PATCH 2/2] update to docker-1.8.0-rc3 --- Makefile.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.docker b/Makefile.docker index c32caa04..d33fbd78 100644 --- a/Makefile.docker +++ b/Makefile.docker @@ -1,8 +1,8 @@ include common.make -DOCKER_BINARY_URL := https://github.com/rancher/docker/releases/download/v1.8.0-rc2-ros/docker-1.8.0-rc2 +DOCKER_BINARY_URL := https://github.com/rancher/docker/releases/download/v1.8.0-rc3-ros/docker-1.8.0-rc3 KERNEL_URL := https://github.com/rancher/os-kernel/releases/download/Ubuntu-3.19.0-26.27/linux-3.19.8-ckt4-rancher-x86.tar.gz -DFS_IMAGE := rancher/docker:1.8.0-rc2 +DFS_IMAGE := rancher/docker:1.8.0-rc3 bin/rancheros: mkdir -p $(dir $@)