rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-10 21:33:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #474 from imikushin/docker-1.8-rc3

Browse Source 
update to docker-1.8.0-rc3
This commit is contained in:
Darren Shepherd 2015-08-10 22:58:30 -07:00
commit 2408fc1231
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.docker
View File

@ -1,8 +1,8 @@
include common.make 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 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: bin/rancheros:
mkdir -p $(dir $@) mkdir -p $(dir $@)

19
scripts/copy-images
View File

@ -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