docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #397 from kitematic/include-iso 

Include boot2docker iso in distribution
This commit is contained in:
Jeffrey Morgan 2015-04-20 12:30:40 -04:00
parent e7b2cabf5c 7031814cc4
commit 4bd61571af
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,6 +11,7 @@ identity*
# Resources # Resources
resources/docker-* resources/docker-*
resources/boot2docker-*
# Cache # Cache
cache cache

3
src/DockerMachine.js
View File

@ -64,7 +64,8 @@ var DockerMachine = {
}, },
create: function () { create: function () {
return util.exec([DockerMachine.command(), '-D', 'create', '-d', 'virtualbox', '--virtualbox-memory', '2048', NAME]); var dockerversion = util.packagejson()['docker-version'];
return util.exec([DockerMachine.command(), '-D', 'create', '-d', 'virtualbox', '--virtualbox-boot2docker-url', path.join(process.cwd(), 'resources', 'boot2docker-' + dockerversion + '.iso'), '--virtualbox-memory', '2048', NAME]);
}, },
start: function () { start: function () {
return util.exec([DockerMachine.command(), '-D', 'start', NAME]); return util.exec([DockerMachine.command(), '-D', 'start', NAME]);

22
util/deps
View File

@ -3,19 +3,20 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BASE=$DIR/.. BASE=$DIR/..
DOCKER_MACHINE_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-machine-version']" "$(cat $BASE/package.json)") DOCKER_MACHINE_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-machine-version']" "$(cat $BASE/package.json)")
DOCKER_MACHINE_CLI_FILE=docker-machine-$DOCKER_MACHINE_CLI_VERSION DOCKER_MACHINE_CLI_FILE=docker-machine-$DOCKER_MACHINE_CLI_VERSION
DOCKER_CLI_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-version']" "$(cat $BASE/package.json)") DOCKER_VERSION=$(node -pe "JSON.parse(process.argv[1])['docker-version']" "$(cat $BASE/package.json)")
DOCKER_CLI_FILE=docker-$DOCKER_CLI_VERSION DOCKER_CLI_FILE=docker-$DOCKER_VERSION
BOOT2DOCKER_FILE=boot2docker-$DOCKER_VERSION.iso
pushd $BASE/resources > /dev/null pushd $BASE/resources > /dev/null
if [ ! -f $DOCKER_CLI_FILE ]; then if [ ! -f $DOCKER_CLI_FILE ]; then
echo "-----> Downloading Docker CLI..." echo "-----> Downloading Docker CLI..."
rm -rf docker-* rm -rf docker-*
curl -L -o docker-$DOCKER_CLI_VERSION.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_CLI_VERSION.tgz curl -L -o docker-$DOCKER_VERSION.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
tar xvzf docker-$DOCKER_CLI_VERSION.tgz --strip=3 tar xvzf docker-$DOCKER_VERSION.tgz --strip=3
rm docker-$DOCKER_CLI_VERSION.tgz rm docker-$DOCKER_VERSION.tgz
mv docker docker-$DOCKER_CLI_VERSION mv docker docker-$DOCKER_VERSION
chmod +x $DOCKER_CLI_FILE chmod +x $DOCKER_VERSION
fi fi
if [ ! -f $DOCKER_MACHINE_CLI_FILE ]; then if [ ! -f $DOCKER_MACHINE_CLI_FILE ]; then
@ -25,4 +26,11 @@ if [ ! -f $DOCKER_MACHINE_CLI_FILE ]; then
chmod +x $DOCKER_MACHINE_CLI_FILE chmod +x $DOCKER_MACHINE_CLI_FILE
fi fi
if [ ! -f $BOOT2DOCKER_FILE ]; then
echo "-----> Downloading Boot2Docker iso..."
rm -rf boot2docker-*
curl -L -o $BOOT2DOCKER_FILE https://github.com/boot2docker/boot2docker/releases/download/v$DOCKER_VERSION/boot2docker.iso
fi
popd > /dev/null popd > /dev/null