Merge pull request #13488 from allisonlarson/allison-docker-exec-command

Pass docker exec_options to executor as kwargs

plugins/providers/docker/command/exec.rb

@@ -94,7 +94,7 @@ def exec_command(machine, command, options)
             Vagrant::Util::SafeExec.exec(exec_cmd[0], *exec_cmd[1..-1])
           else
             output = ""
-            machine.provider.driver.execute(*exec_cmd, exec_options) do |type, data|
+            machine.provider.driver.execute(*exec_cmd, **exec_options) do |type, data|
               output += data
             end
 

test/unit/plugins/providers/docker/command/exec_test.rb

@@ -55,6 +55,17 @@
         subject.exec_command(machine, command, options)
       end
     end
+    describe "with options" do
+      let(:command) { ["ls"] }
+      let(:options) { {etc: "something"} }
+
+      it "passes the options successfully" do
+        driver = instance_double("Driver")
+        expect(driver).to receive(:execute).with("docker", "exec", nil, "ls", {etc: "something"})
+        allow(machine.provider).to receive(:driver) { driver }
+        subject.exec_command(machine, command, options)
+      end
+    end
     describe "without a command" do
       let(:argv) { [] }