haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3356 from pmenglund/docker_deprecated_arguments 

provisioners/docker: fix deprecated docker arguments
This commit is contained in:
Mitchell Hashimoto 2014-04-01 21:51:24 -07:00
parent d2056863de 53194f8e12
commit 9fc2c717a2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/provisioners/docker/client.rb
View File

@ -75,9 +75,9 @@ module VagrantPlugins
end end
def create_container(config) def create_container(config)
args = "-cidfile=#{config[:cidfile]} " args = "--cidfile=#{config[:cidfile]} "
args << "-d " if config[:daemonize] args << "-d " if config[:daemonize]
args << "-name #{config[:name]} " if config[:name] && config[:auto_assign_name] args << "--name #{config[:name]} " if config[:name] && config[:auto_assign_name]
args << config[:args] if config[:args] args << config[:args] if config[:args]
@machine.communicate.sudo %[ @machine.communicate.sudo %[
rm -f #{config[:cidfile]} rm -f #{config[:cidfile]}