Merge pull request voxpupuli#126 from h0tw1r3/fix-remote

Fix privileged remote docker port forward resolution

Author: bastelfreak

lib/beaker/hypervisor/docker.rb

@@ -188,9 +188,9 @@ def get_ssh_connection_info(container)
         end
       end
 
-      if host_config['NetworkMode'] != 'slirp4netns' && network_settings['IPAddress'] && !network_settings['IPAddress'].empty?
-        ip = network_settings['IPAddress'] if ip.nil?
-      else
+      ip = network_settings['IPAddress'] if ip.nil? && host_config['NetworkMode'] != 'slirp4netns' && network_settings['IPAddress'] && !network_settings['IPAddress'].empty?
+
+      if port.nil?
         port22 = network_settings.dig('Ports', '22/tcp')
         port = port22[0]['HostPort'] if port22
       end

spec/beaker/hypervisor/docker_spec.rb

@@ -110,6 +110,12 @@ module Beaker
 
     before do
       allow(::Docker).to receive(:rootless?).and_return(true)
+      @docker_host = ENV.fetch('DOCKER_HOST', nil)
+      ENV.delete('DOCKER_HOST') if @docker_host
+    end
+
+    after do
+      ENV['DOCKER_HOST'] = @docker_host if @docker_host
     end
 
     context 'with connection failure' do
@@ -476,64 +482,46 @@ module Beaker
         end
 
         context 'when connecting to ssh' do
-          context 'when rootless' do
-            before { @docker_host = ENV.fetch('DOCKER_HOST', nil) }
-
-            after { ENV['DOCKER_HOST'] = @docker_host }
-
-            it 'exposes port 22 to beaker' do
-              ENV['DOCKER_HOST'] = nil
-              docker.provision
-
-              expect(hosts[0]['ip']).to eq '127.0.0.1'
-              expect(hosts[0]['port']).to eq 8022
-            end
-
-            it 'exposes port 22 to beaker when using DOCKER_HOST' do
-              ENV['DOCKER_HOST'] = 'tcp://192.0.2.2:2375'
-              docker.provision
-
-              expect(hosts[0]['ip']).to eq '192.0.2.2'
-              expect(hosts[0]['port']).to eq 8022
-            end
+          %w[rootless privileged].each do |mode|
+            context "when #{mode}" do
+              let(:container_mode) do
+                mode
+              end
 
-            it 'has ssh agent forwarding enabled' do
-              ENV['DOCKER_HOST'] = nil
-              docker.provision
+              it 'exposes port 22 to beaker' do
+                docker.provision
 
-              expect(hosts[0]['ip']).to eq '127.0.0.1'
-              expect(hosts[0]['port']).to eq 8022
-              expect(hosts[0]['ssh'][:password]).to eq 'root'
-              expect(hosts[0]['ssh'][:port]).to eq 8022
-              expect(hosts[0]['ssh'][:forward_agent]).to be true
-            end
+                expect(hosts[0]['ip']).to eq '127.0.0.1'
+                expect(hosts[0]['port']).to eq 8022
+              end
 
-            it 'connects to gateway ip' do
-              FakeFS do
-                FileUtils.touch('/.dockerenv')
+              it 'exposes port 22 to beaker when using DOCKER_HOST' do
+                ENV['DOCKER_HOST'] = 'tcp://192.0.2.2:2375'
                 docker.provision
 
-                expect(hosts[0]['ip']).to eq '192.0.2.254'
+                expect(hosts[0]['ip']).to eq '192.0.2.2'
                 expect(hosts[0]['port']).to eq 8022
               end
-            end
-          end
-
-          context 'when rootful' do
-            before { @docker_host = ENV.fetch('DOCKER_HOST', nil) }
 
-            after { ENV['DOCKER_HOST'] = @docker_host }
+              it 'has ssh agent forwarding enabled' do
+                docker.provision
 
-            let(:container_mode) do
-              'rootful'
-            end
+                expect(hosts[0]['ip']).to eq '127.0.0.1'
+                expect(hosts[0]['port']).to eq 8022
+                expect(hosts[0]['ssh'][:password]).to eq 'root'
+                expect(hosts[0]['ssh'][:port]).to eq 8022
+                expect(hosts[0]['ssh'][:forward_agent]).to be true
+              end
 
-            it 'exposes port 22 to beaker' do
-              ENV['DOCKER_HOST'] = nil
-              docker.provision
+              it 'connects to gateway ip' do
+                FakeFS do
+                  FileUtils.touch('/.dockerenv')
+                  docker.provision
 
-              expect(hosts[0]['ip']).to eq '127.0.0.1'
-              expect(hosts[0]['port']).to eq 8022
+                  expect(hosts[0]['ip']).to eq '192.0.2.254'
+                  expect(hosts[0]['port']).to eq 8022
+                end
+              end
             end
           end
         end