cookbooks/vagrant/templates/default/Vagrantfile.docker.erb in tvd-vagrant-0.0.17 vs cookbooks/vagrant/templates/default/Vagrantfile.docker.erb in tvd-vagrant-0.0.18
- old
+ new
@@ -1,7 +1,9 @@
require "vagrant-shell"
+VagrantPlugins::Shell::Plugin.make_provider(:docker)
+
Vagrant.configure("2") do |config|
config.vm.box = "<%= node[:vagrant][:box] %>"
<% if node[:vagrant][:ssh_username] %>
config.ssh.username = "<%= node[:vagrant][:ssh_username] %>"
@@ -9,20 +11,14 @@
<% if node[:vagrant][:ssh_private_key_path] %>
config.ssh.private_key_path = "<%= node[:vagrant][:ssh_private_key_path] %>"
<% end %>
- <% if node[:vagrant][:provision] && node[:vagrant][:provision][:shell] %>
- config.vm.provision :shell,
- :path => "<%= node[:vagrant][:provision][:shell][:path] %>",
- :args => "<%= node[:vagrant][:provision][:shell][:args] %>"
- <% end %>
-
config.vm.synced_folder ".", "/vagrant", :id => "vagrant-root", :disabled => true
- config.vm.provider :shell do |shell|
- shell.script = "<%= node[:vagrant][:shell_script] %>"
- shell.run_args = [ "<%= node[:vagrant][:shell_args] %>" ]
+ config.vm.provider :docker do |docker, override|
+ docker.script = docker.find_script(:docker)
+ docker.run_args = [ "<%= node[:vagrant][:shell_args] %>" ]
end
end
# vi: set ft=ruby :