kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #3125 from rjeczalik/master

Browse source 
vagrant: added PRIVATE_NETWORK env var
This commit is contained in:
unclejack 2014-01-31 01:06:47 -08:00
commit 59ec012efc
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Vagrantfile vendored
View file

@ -8,10 +8,9 @@ AWS_BOX_URI = ENV['BOX_URI'] || "https://github.com/mitchellh/vagrant-aws/raw/ma
AWS_REGION = ENV['AWS_REGION'] || "us-east-1" AWS_REGION = ENV['AWS_REGION'] || "us-east-1"
AWS_AMI = ENV['AWS_AMI'] || "ami-69f5a900" AWS_AMI = ENV['AWS_AMI'] || "ami-69f5a900"
AWS_INSTANCE_TYPE = ENV['AWS_INSTANCE_TYPE'] || 't1.micro' AWS_INSTANCE_TYPE = ENV['AWS_INSTANCE_TYPE'] || 't1.micro'
FORWARD_DOCKER_PORTS = ENV['FORWARD_DOCKER_PORTS'] FORWARD_DOCKER_PORTS = ENV['FORWARD_DOCKER_PORTS']
SSH_PRIVKEY_PATH = ENV['SSH_PRIVKEY_PATH']
SSH_PRIVKEY_PATH = ENV["SSH_PRIVKEY_PATH"] PRIVATE_NETWORK = ENV['PRIVATE_NETWORK']
# A script to upgrade from the 12.04 kernel to the raring backport kernel (3.8) # A script to upgrade from the 12.04 kernel to the raring backport kernel (3.8)
# and install docker. # and install docker.
@ -174,3 +173,14 @@ if !FORWARD_DOCKER_PORTS.nil?
end end
end end
end end
if !PRIVATE_NETWORK.nil?
Vagrant::VERSION < "1.1.0" and Vagrant::Config.run do |config|
config.vm.network :hostonly, PRIVATE_NETWORK
end
Vagrant::VERSION >= "1.1.0" and Vagrant.configure("2") do |config|
config.vm.network "private_network", ip: PRIVATE_NETWORK
end
end