Skip to content
This repository has been archived by the owner on Apr 2, 2020. It is now read-only.

allow the vagrant box to be configurable #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow the vagrant box to be configurable #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,23 @@ The URL used to download the docker client.

Default: <http://get.docker.io/builds/Darwin/x86_64/docker-${DOCKER_VERSION}.tgz>

### VAGRANT_BOX

The name of the vagrant box to use.

Default: `docker-0.8.0`

### VAGRANT_BOX_URL

The URL used to download the vagrant box.

Default: <http://static.orchardup.com/binaries/vagrant/vagrant-docker-0.8.0-virtualbox.box>
Default: <http://static.orchardup.com/binaries/vagrant/vagrant-${VAGRANT_BOX}-virtualbox.box>

## Contributors

* [Julien Duponchelle](https://github.com/noplay/) – Original author
* [Ben Firshman](https://github.com/bfirsh) – Faster and simpler installation with Vagrant image and pre-built binary
* [Michael Merickel](https://github.com/mmerickel) - Support for defaults.


## Alternatives
Expand Down
7 changes: 4 additions & 3 deletions docker-osx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ DOCKER_IP="172.16.42.43"
DOCKER_DOMAIN="localdocker"
DOCKER_PORT="4243"

DOCKER_VERSION="1.0.0"
DOCKER_VERSION="1.1.0"
VAGRANT_BOX="docker-0.8.0"

DOCKER_BIN="/usr/local/bin/docker"

Expand All @@ -43,7 +44,7 @@ then
fi
if [ -z "$VAGRANT_BOX_URL" ]
then
VAGRANT_BOX_URL="http://static.orchardup.com/binaries/vagrant/vagrant-docker-0.8.0-virtualbox.box"
VAGRANT_BOX_URL="http://static.orchardup.com/binaries/vagrant/vagrant-${VAGRANT_BOX}-virtualbox.box"
fi
export DOCKER_HOST="tcp://$DOCKER_IP:$DOCKER_PORT"

Expand Down Expand Up @@ -140,7 +141,7 @@ cat > "$VAGRANT_CWD/Vagrantfile" <<EOL
# automatically generated by docker-osx
# do not edit this file - find the template in docker-osx script instead!
Vagrant.configure("2") do |config|
config.vm.box = "docker-0.8.0"
config.vm.box = "$VAGRANT_BOX"
config.vm.box_url = "$VAGRANT_BOX_URL"

config.ssh.forward_agent = true
Expand Down