beaker-docker 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20458b7863defa8965bb32ebf8509c39cb8879b6a3d77c738fe76c55ad80b7b0
-  data.tar.gz: de353c5f2b2a75edefed8e4926eeb07792717173db68cfa3081fa5e747920a17
+  metadata.gz: 06f9fc450f23708d94b3a68993497c7f9f71fa60772b8b78ca7eb5ddd7668416
+  data.tar.gz: abb226ed9841f2d44801729924e6ed38f2c4dfe8067b2379875d21006e04442c
 SHA512:
-  metadata.gz: b17e5c8962e810565652fd962a7240c2d328e3ac08793da48416040fa7b4351863b85d0e0043518c57e1b31db7cd5c433103e394bc262504fae6f7d42485c4f2
-  data.tar.gz: 38928914ecb2b8b5bbfc9fff9dacfce07a852d0c937e22b5ebea97dcccba77a7442ca0c9c61ad23bd0b224a6c26037cf2f9b08e34a984c39fe0aa3207b5e4e30
+  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,14 @@
 # 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)

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
@@ -356,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.1'
+  VERSION = '3.1.2'
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -689,14 +689,13 @@ module Beaker
             end
           end
 
-          context 'when IPAddress is empty but available in Networks' do
+          context 'when using newer docker-ce where IPs are only in Networks' do
             let(:container_config) do
               {
                 'HostConfig' => {
                   'NetworkMode' => 'bridge',
                 },
                 'NetworkSettings' => {
-                  'IPAddress' => '',
                   'Ports' => {
                     '22/tcp' => [
                       {
@@ -705,9 +704,9 @@ module Beaker
                       },
                     ],
                   },
-                  'Gateway' => '192.0.2.254',
                   'Networks' => {
                     'bridge' => {
+                      'Gateway' => '192.0.2.254',
                       'IPAddress' => '192.0.2.10',
                     },
                   },
@@ -723,6 +722,20 @@ module Beaker
 
                 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

metadata

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