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

docker: use Kernel.system for docker-exec when -t is given

This commit is contained in:
Isaac Freeman 2018-04-18 17:50:47 -04:00
parent e6887b8305
commit de71626922
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/providers/docker/command/exec.rb
View File

@ -84,18 +84,21 @@ module VagrantPlugins
# Run this interactively if asked.
exec_options = options
exec_options[:stdin] = true if options[:pty]
output = ""
machine.provider.driver.execute(*exec_cmd, exec_options) do |type, data|
output += data
end
if options[:pty]
Kernel.system(*exec_cmd)
else
output = ""
machine.provider.driver.execute(*exec_cmd, exec_options) do |type, data|
output += data
end
output_options = {}
output_options[:prefix] = false if !options[:prefix]
output_options = {}
output_options[:prefix] = false if !options[:prefix]
if !output.empty?
machine.ui.output(output.chomp, **output_options)
if !output.empty?
machine.ui.output(output.chomp, **output_options)
end
end
end
end