1
0
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00

Merge branch 'master' of github.com:sidharthamani/os into sidharthamani-master

Conflicts:
	config/config.go
This commit is contained in:
Darren Shepherd
2015-02-16 20:56:00 -07:00
6 changed files with 234 additions and 12 deletions

View File

@@ -5,7 +5,7 @@ set -x
cd $(dirname $0)/..
apt-get update
apt-get install -y curl rsync build-essential syslinux xorriso
apt-get install -y curl rsync build-essential syslinux xorriso libblkid-dev
curl -sL https://github.com/ibuildthecloud/docker/releases/download/v1.5.0-rancher-2/docker-1.5.0 > /usr/bin/docker