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

Fix docker driver handling cli flags 

Make opts argument set to nil instead of splat to make Travis Ruby 2.3
happy
This commit is contained in:
Brian Cain 2019-03-05 10:57:05 -08:00
parent 2be0bc2d81
commit b78dada2c7
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/providers/docker/driver.rb
View File

@ -180,23 +180,23 @@ module VagrantPlugins
# @param [String] network - name of network to connect conatiner to
# @param [String] cid - container id
# @param [Array] opts - An array of flags used for listing networks
def connect_network(network, cid, *opts)
command = ['docker', 'network', 'connect', network, cid].concat(*opts)
def connect_network(network, cid, opts=nil)
command = ['docker', 'network', 'connect', network, cid].push(*opts)
output = execute(*command)
output
end
# @param [String] network - name of network to create
# @param [Array] opts - An array of flags used for listing networks
def create_network(network, *opts)
command = ['docker', 'network', 'create', network].concat(*opts)
def create_network(network, opts=nil)
command = ['docker', 'network', 'create', network].push(*opts)
output = execute(*command)
output
end
# @param [String] network - name of network to disconnect container from
# @param [String] cid - container id
def disconnect_network(network, cid, *opts)
def disconnect_network(network, cid)
command = ['docker', 'network', 'disconnect', network, cid, "--force"]
output = execute(*command)
output
@ -204,15 +204,15 @@ module VagrantPlugins
# @param [Array] networks - list of networks to inspect
# @param [Array] opts - An array of flags used for listing networks
def inspect_network(network, *opts)
command = ['docker', 'network', 'inspect', network].concat(*opts)
def inspect_network(network, opts=nil)
command = ['docker', 'network', 'inspect', network].push(*opts)
output = execute(*command)
output
end
# @param [Array] opts - An array of flags used for listing networks
def list_network(*opts)
command = ['docker', 'network', 'ls'].concat(*opts)
def list_network(opts=nil)
command = ['docker', 'network', 'ls'].push(*opts)
output = execute(*command)
output
end
@ -221,8 +221,8 @@ module VagrantPlugins
# networks not created by Vagrant.
#
# @param [Array] opts - An array of flags used for listing networks
def prune_network(*opts)
command = ['docker', 'network', 'prune', '--force'].concat(*opts)
def prune_network(opts=nil)
command = ['docker', 'network', 'prune', '--force'].push(*opts)
output = execute(*command)
output
end