Manually merged

https://github.com/igorpecovnik/lib/pull/262
This commit is contained in:
Igor Pecovnik 2016-04-07 16:06:41 +02:00
commit 27e25af978

20
Vagrantfile vendored
View file

@ -17,7 +17,7 @@ Vagrant.configure(2) do |config|
# Disable automatic box update checking. If you disable this, then # Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs # boxes will only be checked for updates when the user runs
# `vagrant box outdated`. This is not recommended. # `vagrant box outdated`. This is not recommended.
# config.vm.box_check_update = false config.vm.box_check_update = true
# Create a forwarded port mapping which allows access to a specific port # Create a forwarded port mapping which allows access to a specific port
# within the machine from a port on the host machine. In the example below, # within the machine from a port on the host machine. In the example below,
@ -31,24 +31,26 @@ Vagrant.configure(2) do |config|
# Create a public network, which generally matched to bridged network. # Create a public network, which generally matched to bridged network.
# Bridged networks make the machine appear as another physical device on # Bridged networks make the machine appear as another physical device on
# your network. # your network.
# config.vm.network "public_network" config.vm.network "public_network"
# Share an additional folder to the guest VM. The first argument is # Share an additional folder to the guest VM. The first argument is
# the path on the host to the actual folder. The second argument is # the path on the host to the actual folder. The second argument is
# the path on the guest to mount the folder. And the optional third # the path on the guest to mount the folder. And the optional third
# argument is a set of non-required options. # argument is a set of non-required options.
# config.vm.synced_folder "../data", "/vagrant_data" config.vm.synced_folder ".", "/vagrant/lib"
config.vm.synced_folder "/home/faddat/git/lib/output", "/vagrant/output"
# Provider-specific configuration so you can fine-tune various # Provider-specific configuration so you can fine-tune various
# backing providers for Vagrant. These expose provider-specific options. # backing providers for Vagrant. These expose provider-specific options.
# Example for VirtualBox: # Example for VirtualBox:
# #
config.vm.provider "virtualbox" do |vb| config.vm.provider "virtualbox" do |vb|
# # Display the VirtualBox GUI when booting the machine # Display the VirtualBox GUI when booting the machine
# vb.gui = true vb.gui = true
# Customize the amount of memory on the VM: # Customize the amount of memory on the VM:
vb.memory = "2048" vb.memory = "8192"
vb.cpus = "4"
end end
# #
# View the documentation for the provider you are using for more # View the documentation for the provider you are using for more
@ -68,4 +70,4 @@ Vagrant.configure(2) do |config|
# sudo apt-get update # sudo apt-get update
# sudo apt-get install -y apache2 # sudo apt-get install -y apache2
# SHELL # SHELL
end end