beaker-docker 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32bbe60ffa590b3dadc093f098b34513b036bb104f4f8017a9ad233127974a02
-  data.tar.gz: 1ba3e290c1c18be4ae5d66baa5cbfd5d99b77b5d57213e50868b5bf940568793
+  metadata.gz: 06f9fc450f23708d94b3a68993497c7f9f71fa60772b8b78ca7eb5ddd7668416
+  data.tar.gz: abb226ed9841f2d44801729924e6ed38f2c4dfe8067b2379875d21006e04442c
 SHA512:
-  metadata.gz: 8693d6608fa81f4c21e71ad011a2c50a427e7304a445cb19aeb7f9c54c817310f3e13ac1114d84ff8bdc3446ae7f255ca97d794ca0134d73013a8de94fdb5b01
-  data.tar.gz: 0137e77889c7570d3338d7a24bafe0861ba37cb72b8944577ad6c4b7e1c0ec3d0487e679e203110d4ab9144e62187561f03a94f7cce91e22ef42cdd56b539c50
+  metadata.gz: 3cb84d39f6f5781dffb3fa7e4f90c22d6289d4a2f94813eabc68fcc189ad751d16640b79b6d102347908167eb72bbe07a721519a9598939a1e1302ebd1328da2
+  data.tar.gz: f5fb1783aead6963196fa14e3a73195ace14d8f80504e0e7036d05e3b0e8243d4d81961dca38506db2554e581f8c57a166178fe1f652625b165bb787eb3264cb

data/.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
         shell: bash
         run: gem build --verbose *.gemspec
       - name: Upload gem to GitHub cache
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: gem-artifact
           path: '*.gem'
@@ -39,7 +39,7 @@ jobs:
       contents: write # clone repo and create release
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: gem-artifact
       - name: Create Release
@@ -56,7 +56,7 @@ jobs:
       packages: write # publish to rubygems.pkg.github.com
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: gem-artifact
       - name: Publish gem to GitHub packages
@@ -73,7 +73,7 @@ jobs:
       id-token: write # rubygems.org authentication
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: gem-artifact
       - uses: rubygems/configure-rubygems-credentials@v1.0.0
@@ -92,7 +92,7 @@ jobs:
       - release-to-rubygems
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: gem-artifact
       - name: Install Ruby

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [3.1.2](https://github.com/voxpupuli/beaker-docker/tree/3.1.2) (2026-02-27)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/3.1.1...3.1.2)
+
+**Fixed bugs:**
+
+- fix: complete the support for docker-ce \>= v29 network configuration [\#183](https://github.com/voxpupuli/beaker-docker/pull/183) ([mxey](https://github.com/mxey))
+- Handle empty IPAddress when setting host vm\_ip [\#182](https://github.com/voxpupuli/beaker-docker/pull/182) ([uvNikita](https://github.com/uvNikita))
+
+## [3.1.1](https://github.com/voxpupuli/beaker-docker/tree/3.1.1) (2026-01-31)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/3.1.0...3.1.1)
+
+**Fixed bugs:**
+
+- Handle both podman and docker to get SUT container IP address [\#180](https://github.com/voxpupuli/beaker-docker/pull/180) ([alelindq](https://github.com/alelindq))
+
 ## [3.1.0](https://github.com/voxpupuli/beaker-docker/tree/3.1.0) (2025-12-27)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/3.0.1...3.1.0)

data/lib/beaker/hypervisor/docker.rb

@@ -151,6 +151,10 @@ module Beaker
       elsif in_container? && !nested_docker?
         # Swarm or local docker host
         gw = network_settings['Gateway']
+
+        # also handle scenarios where network_settings['Gateway'] is not set (e.g. docker-ce >= v29)
+        gw = network_settings['Networks'][host_config['NetworkMode']]['Gateway'] if gw.nil? || gw.empty?
+
         ip = gw unless gw.nil? || gw.empty?
       else
         # The many faces of container networking
@@ -164,7 +168,9 @@ module Beaker
 
         # Container to container
         unless ip && port
-          ip = network_settings['IPAddress']
+          ip = network_settings['IPAddress'] # podman
+          # also handle scenarios where network_settings['IPAddress'] is not set (e.g. docker-ce >= v29)
+          ip = network_settings['Networks'][host_config['NetworkMode']]['IPAddress'] if ip.nil? || ip.empty?
           port = (ip && !ip.empty?) ? 22 : nil
         end
 
@@ -354,7 +360,11 @@ module Beaker
         @logger.debug("node available as ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@#{ip} -p #{port}")
         host['docker_container_id'] = container.id
         host['docker_image_id'] = image.id
-        host['vm_ip'] = container.json['NetworkSettings']['IPAddress'].to_s
+        host_config = container.json['HostConfig']
+        vm_ip = container.json['NetworkSettings']['IPAddress']
+        # handle scenarios where network_settings['IPAddress'] is not set (e.g. docker-ce >= v29)
+        vm_ip = container.json['NetworkSettings']['Networks'][host_config['NetworkMode']]['IPAddress'] if vm_ip.nil? || vm_ip.empty?
+        host['vm_ip'] = vm_ip.to_s
 
         def host.reboot
           @logger.warn('Rebooting containers is ineffective...ignoring')

data/lib/beaker-docker/version.rb

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

data/spec/beaker/hypervisor/docker_spec.rb

@@ -688,6 +688,57 @@ module Beaker
               end
             end
           end
+
+          context 'when using newer docker-ce where IPs are only in Networks' do
+            let(:container_config) do
+              {
+                'HostConfig' => {
+                  'NetworkMode' => 'bridge',
+                },
+                'NetworkSettings' => {
+                  'Ports' => {
+                    '22/tcp' => [
+                      {
+                        'HostIp' => '0.0.0.0',
+                        'HostPort' => 8022,
+                      },
+                    ],
+                  },
+                  'Networks' => {
+                    'bridge' => {
+                      'Gateway' => '192.0.2.254',
+                      'IPAddress' => '192.0.2.10',
+                    },
+                  },
+                },
+              }
+            end
+
+            it 'falls back to Networks[NetworkMode][IPAddress]' do
+              ENV['DOCKER_IN_DOCKER'] = 'true'
+              FakeFS do
+                FileUtils.touch('/.dockerenv')
+                docker.provision
+
+                expect(hosts[0]['ip']).to eq '192.0.2.10'
+                expect(hosts[0]['port']).to eq 22
+                expect(hosts[0]['vm_ip']).to eq '192.0.2.10'
+              end
+            end
+
+            it 'stills finds gateway' do
+              ENV['DOCKER_IN_DOCKER'] = nil
+              ENV['DOCKER_HOST'] = nil
+              FakeFS do
+                FileUtils.touch('/.dockerenv')
+                docker.provision
+
+                expect(hosts[0]['ip']).to eq '192.0.2.254'
+                expect(hosts[0]['port']).to eq 8022
+                expect(hosts[0]['vm_ip']).to eq '192.0.2.10'
+              end
+            end
+          end
         end
 
         it 'generates a new /etc/hosts file referencing each host' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Vox Pupuli