Tks to @stucki work on #92 there is no need to do this anymore :)
This commit is contained in:
parent
c3e6eb4e51
commit
8006766691
3 changed files with 3 additions and 20 deletions
2
development/Vagrantfile
vendored
2
development/Vagrantfile
vendored
|
@ -72,7 +72,7 @@ Vagrant.configure("2") do |config|
|
||||||
if box_config[:lxc_url]
|
if box_config[:lxc_url]
|
||||||
vm_config.vm.provider :lxc do |lxc, lxc_config|
|
vm_config.vm.provider :lxc do |lxc, lxc_config|
|
||||||
lxc_config.vm.box_url = box_config[:lxc_url]
|
lxc_config.vm.box_url = box_config[:lxc_url]
|
||||||
lxc_config.vm.hostname = 'lxc-dev-box' unless %w(squeeze wheezy sid).include? box_name.to_s
|
lxc_config.vm.hostname = 'lxc-dev-box'
|
||||||
|
|
||||||
# Required to boot nested containers
|
# Required to boot nested containers
|
||||||
lxc.customize 'aa_profile', 'unconfined' unless %w(squeeze wheezy sid).include? box_name.to_s
|
lxc.customize 'aa_profile', 'unconfined' unless %w(squeeze wheezy sid).include? box_name.to_s
|
||||||
|
|
16
example/Vagrantfile
vendored
16
example/Vagrantfile
vendored
|
@ -28,7 +28,7 @@ echo "Hi there I'm a shell script used for provisioning"
|
||||||
end
|
end
|
||||||
|
|
||||||
port = 8080
|
port = 8080
|
||||||
releases = %w(precise quantal raring)
|
releases = %w(precise quantal raring wheezy squeeze sid)
|
||||||
releases.each do |release|
|
releases.each do |release|
|
||||||
config.vm.define(release) do |lxc_config|
|
config.vm.define(release) do |lxc_config|
|
||||||
lxc_config.vm.box = "#{release}64"
|
lxc_config.vm.box = "#{release}64"
|
||||||
|
@ -39,18 +39,4 @@ echo "Hi there I'm a shell script used for provisioning"
|
||||||
lxc_config.vm.hostname = "lxc-#{release}64-example"
|
lxc_config.vm.hostname = "lxc-#{release}64-example"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
port = 8090
|
|
||||||
releases = %w(wheezy squeeze sid)
|
|
||||||
releases.each do |release|
|
|
||||||
config.vm.define(release) do |lxc_config|
|
|
||||||
lxc_config.vm.box = "#{release}64"
|
|
||||||
lxc_config.vm.box_url = "http://dl.dropbox.com/u/13510779/lxc-#{release}-amd64-2013-05-08.box"
|
|
||||||
lxc_config.vm.network :forwarded_port, guest: 80, host: (port += 1)
|
|
||||||
# Uncomment if you want to try out a box built locally
|
|
||||||
# lxc_config.vm.box_url = "../boxes/output/lxc-#{release}64.box"
|
|
||||||
# Does not work yet:
|
|
||||||
# lxc_config.vm.hostname = "lxc-#{release}64-example"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
5
spec/Vagrantfile
vendored
5
spec/Vagrantfile
vendored
|
@ -8,10 +8,7 @@ ENV['BOX_NAME'] ||= 'quantal64'
|
||||||
|
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
config.vm.box = ENV['BOX_NAME']
|
config.vm.box = ENV['BOX_NAME']
|
||||||
# FIXME: Find out why this does not work for debian boxes
|
config.vm.hostname = 'lxc-test-box'
|
||||||
unless %w( squeeze64 wheezy64 sid64 ).include? config.vm.box
|
|
||||||
config.vm.hostname = 'lxc-test-box'
|
|
||||||
end
|
|
||||||
|
|
||||||
config.cache.enable :apt
|
config.cache.enable :apt
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue