40n8.me/baseimage-docker
1
0
Fork 0
mirror of /repos/baseimage-docker.git synced 2025-12-30 08:01:31 +01:00
Code Issues Releases Wiki Activity

Cleanup Amir Gur's patch

Browse Source
This commit is contained in:
Hongli Lai (Phusion) 2014-03-25 15:36:15 +01:00
parent c8e79991b7
commit 55727c2f30
No known key found for this signature in database
GPG Key ID: 06A131094B6F4332
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Vagrantfile vendored
View File

@ -1,20 +1,20 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
ROOT = File.dirname(File.expand_path(__FILE__)) ROOT = File.dirname(File.absolute_path(__FILE__))
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = '2' VAGRANTFILE_API_VERSION = '2'
# Default env properties which can be overridden # Default env properties which can be overridden
# Example overrides: # Example overrides:
# echo "ENV['PASSENGER_PATH_URI' ] ||= '../../phusion/passenger-docker' " >> ~/.vagrant.d/Vagrantfile # echo "ENV['PASSENGER_DOCKER_PATH'] ||= '../../phusion/passenger-docker' " >> ~/.vagrant.d/Vagrantfile
# echo "ENV['BASE_BOX_URL'] ||= 'd\:/dev/vm/vagrant/boxes/phusion/'" >> ~/.vagrant.d/Vagrantfile # echo "ENV['BASE_BOX_URL'] ||= 'd\:/dev/vm/vagrant/boxes/phusion/'" >> ~/.vagrant.d/Vagrantfile
BASE_BOX_URL = ENV['BASE_BOX_URL' ] || 'https://oss-binaries.phusionpassenger.com/vagrant/boxes/' BASE_BOX_URL = ENV['BASE_BOX_URL'] || 'https://oss-binaries.phusionpassenger.com/vagrant/boxes/'
VAGRANT_BOX_URL = ENV['VAGRANT_BOX_URL' ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vbox.box' VAGRANT_BOX_URL = ENV['VAGRANT_BOX_URL'] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vbox.box'
VMWARE_BOX_URL = ENV['VMWARE_BOX_URL' ] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vmwarefusion.box' VMWARE_BOX_URL = ENV['VMWARE_BOX_URL'] || BASE_BOX_URL + 'ubuntu-12.04.3-amd64-vmwarefusion.box'
BASEIMAGE_PATH_URI = ENV['BASEIMAGE_PATH_URI' ] || '../baseimage-docker' BASEIMAGE_PATH = ENV['BASEIMAGE_PATH' ] || '.'
PASSENGER_PATH_URI = ENV['PASSENGER_PATH_URI' ] || '../passenger-docker' PASSENGER_DOCKER_PATH = ENV['PASSENGER_PATH' ] || '../passenger-docker'
DOCKERIZER_PATH_URI = ENV['DOCKERIZER_PATH_URI'] || '../dockerizer' DOCKERIZER_PATH = ENV['DOCKERIZER_PATH'] || '../dockerizer'
$script = <<SCRIPT $script = <<SCRIPT
wget -q -O - https://get.docker.io/gpg | apt-key add - wget -q -O - https://get.docker.io/gpg | apt-key add -
@ -30,17 +30,17 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = 'phusion-open-ubuntu-12.04-amd64' config.vm.box = 'phusion-open-ubuntu-12.04-amd64'
config.vm.box_url = VAGRANT_BOX_URL config.vm.box_url = VAGRANT_BOX_URL
config.ssh.forward_agent = true config.ssh.forward_agent = true
passenger_path = "#{ROOT}/#{PASSENGER_PATH_URI}" passenger_docker_path = File.absolute_path(PASSENGER_DOCKER_PATH, ROOT)
if File.directory?(passenger_path) if File.directory?(passenger_docker_path)
config.vm.synced_folder File.expand_path(passenger_path), '/vagrant/passenger-docker' config.vm.synced_folder passenger_docker_path, '/vagrant/passenger-docker'
end end
baseimage_path = "#{ROOT}/#{BASEIMAGE_PATH_URI}" baseimage_path = File.absolute_path(BASEIMAGE_PATH, ROOT)
if File.directory?(baseimage_path) if File.directory?(baseimage_path)
config.vm.synced_folder File.expand_path(baseimage_path), '/vagrant/baseimage-docker' config.vm.synced_folder baseimage_path, "/vagrant/baseimage-docker"
end end
dockerizer_path = "#{ROOT}/#{DOCKERIZER_PATH_URI}" dockerizer_path = File.absolute_path(DOCKERIZER_PATH, ROOT)
if File.directory?(dockerizer_path) if File.directory?(dockerizer_path)
config.vm.synced_folder File.expand_path(dockerizer_path), '/vagrant/dockerizer' config.vm.synced_folder dockerizer_path, '/vagrant/dockerizer'
end end
config.vm.provider :vmware_fusion do |f, override| config.vm.provider :vmware_fusion do |f, override|