beaker-docker 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 841111065b59b77771dab0534b4f9e3f3963378c0a0daf27d86330ab0c733f7a
-  data.tar.gz: '025243139d8c52cad6a50cd5fa27e6cea07414cdb278aadb395072bd1897448d'
+  metadata.gz: 6264189ab77d7c85932a5e565c593365f07450b25d38796e1349c5304754b7cc
+  data.tar.gz: fa7f1dcde6a3b11121972a67a91c2c365db17f0ea2e22e36777cef1b07cb88c9
 SHA512:
-  metadata.gz: 98afc27265b51cd18868d25651e7003e50f9c26785af54ab277d0e9c673d256aad8a2f4b16905e096c1a2917766b247e44c11d75ae7a7f80e8bd6689174325b4
-  data.tar.gz: 3d84cef6317f571b79277c17cd3be523184a04fd81aa97bd7e4f3340417aabc19c2a07bbc339c13529e644efbf2b37f099ed1e41e6072d7f00b847e41b3fbb49
+  metadata.gz: ff0d8b74a89100b457d1beed90cf9f53e33c93ca891b8c377ee795a06fc261154ee5fd9c88eddc5c68b6517d4129961109e874eac2925ca56907962cd26ad2d6
+  data.tar.gz: 4af9b0bd85a33e02c078f743fd9eeeacaed4862e8dfc3f4497713a0dbd630658fb68100a8fdad8d0e7022dfa998f34a57f55c727b0e1b2264fcdb7337ad23109

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.2.1](https://github.com/voxpupuli/beaker-docker/tree/2.2.1) (2024-03-27)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.2.0...2.2.1)
+
+**Fixed bugs:**
+
+- Fix privileged remote docker port forward resolution  [\#126](https://github.com/voxpupuli/beaker-docker/pull/126) ([h0tw1r3](https://github.com/h0tw1r3))
+
 ## [2.2.0](https://github.com/voxpupuli/beaker-docker/tree/2.2.0) (2024-03-17)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.1.0...2.2.0)

data/lib/beaker/hypervisor/docker.rb

@@ -188,9 +188,9 @@ module Beaker
         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

data/lib/beaker-docker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BeakerDocker
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-17 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs