beaker-docker 3.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9671831d726e2c11bc67a47389a773e4d790228efc42ea0c701ecf63c98c5f1c
-  data.tar.gz: cfe816617cf164e57f54de609361d807a24ffea356e80bd6cdea34fff84a5f6b
+  metadata.gz: 20458b7863defa8965bb32ebf8509c39cb8879b6a3d77c738fe76c55ad80b7b0
+  data.tar.gz: de353c5f2b2a75edefed8e4926eeb07792717173db68cfa3081fa5e747920a17
 SHA512:
-  metadata.gz: 1b5f040eaacb8872a172c507c79a3ecaa8d5fdc7ad9e179e9f3939fc3959e03e147e9d4515a9afa58a105be268a2db2c038c4711fc466208c99d1a7268145ddc
-  data.tar.gz: 7da95bd35c838a090de937e02cb04601e4dadb8f7523d2791cc1207651fa306bcc4234f08cacb941da51d89becf7a46816c7d8f72e1454ccc2a3d399e33873ad
+  metadata.gz: b17e5c8962e810565652fd962a7240c2d328e3ac08793da48416040fa7b4351863b85d0e0043518c57e1b31db7cd5c433103e394bc262504fae6f7d42485c4f2
+  data.tar.gz: 38928914ecb2b8b5bbfc9fff9dacfce07a852d0c937e22b5ebea97dcccba77a7442ca0c9c61ad23bd0b224a6c26037cf2f9b08e34a984c39fe0aa3207b5e4e30

data/.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     name: Build the gem
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -24,7 +24,7 @@ jobs:
         shell: bash
         run: gem build --verbose *.gemspec
       - name: Upload gem to GitHub cache
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         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@v5
+        uses: actions/download-artifact@v7
         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@v5
+        uses: actions/download-artifact@v7
         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@v5
+        uses: actions/download-artifact@v7
         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@v5
+        uses: actions/download-artifact@v7
         with:
           name: gem-artifact
       - name: Install Ruby

data/.github/workflows/test.yml

@@ -16,16 +16,16 @@ jobs:
     outputs:
       ruby: ${{ steps.ruby.outputs.versions }}
     steps:
-      - uses: actions/checkout@v5
-      - name: Install Ruby 3.4
+      - uses: actions/checkout@v6
+      - name: Install Ruby 4.0
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.4"
+          ruby-version: '4.0'
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rake rubocop
       - id: ruby
-        uses: voxpupuli/ruby-version@v1
+        uses: voxpupuli/ruby-version@v2
 
   rspec:
     runs-on: ubuntu-24.04
@@ -36,7 +36,7 @@ jobs:
         ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
     name: RSpec - Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
@@ -56,7 +56,7 @@ jobs:
         ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
     name: Docker on Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
@@ -71,7 +71,7 @@ jobs:
   #  needs: rubocop_and_matrix
   #  name: Docker - Beaker in container connection test
   #  steps:
-  #    - uses: actions/checkout@v5
+  #    - uses: actions/checkout@v6
   #    # use this and not container key from gha to not have a docker network from github
   #    - name: Run Beaker in docker container
   #      uses: addnab/docker-run-action@v3
@@ -99,7 +99,7 @@ jobs:
         run: |
           sudo systemctl stop docker.service docker.socket && systemctl start --user podman.socket
           echo "DOCKER_HOST=unix:///run/user/$(id -u)/podman/podman.sock" >> "$GITHUB_ENV"
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:

data/.rubocop.yml

@@ -8,6 +8,3 @@ Naming/FileName:
   Description: Some files violates the snake_case convention
   Exclude:
     - 'lib/beaker-docker.rb'
-
-AllCops:
-  TargetRubyVersion: 3.2

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.79.2.
+# using RuboCop version 1.81.7.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,6 +11,11 @@
 RSpec/ExampleLength:
   Max: 36
 
+# Offense count: 1
+RSpec/LeakyLocalVariable:
+  Exclude:
+    - 'spec/beaker/hypervisor/docker_spec.rb'
+
 # Offense count: 60
 # Configuration parameters: .
 # SupportedStyles: have_received, receive

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 
-## [3.0.1](https://github.com/voxpupuli/beaker-docker/tree/3.0.1) (2025-09-30)
+## [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)
+
+**Implemented enhancements:**
+
+- Add Ruby 4.0 support [\#177](https://github.com/voxpupuli/beaker-docker/pull/177) ([bastelfreak](https://github.com/bastelfreak))
+
+## [3.0.1](https://github.com/voxpupuli/beaker-docker/tree/3.0.1) (2025-10-01)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/3.0.0...3.0.1)
 

data/beaker-docker.gemspec

@@ -22,13 +22,15 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 3.2', '< 4'
+  s.required_ruby_version = '>= 3.2', '< 5'
 
   # Testing dependencies
   s.add_development_dependency 'fakefs', '>= 1.3', '< 4'
+  # can be removed when https://github.com/fakefs/fakefs/pull/527 is merged
+  s.add_development_dependency 'irb', '< 2'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 5.1.0'
 
   # Run time dependencies
   s.add_dependency 'beaker', '>= 4', '< 8'

data/lib/beaker/hypervisor/docker.rb

@@ -164,7 +164,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
 

data/lib/beaker-docker/version.rb

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

data/spec/beaker/hypervisor/docker_spec.rb

@@ -688,6 +688,44 @@ module Beaker
               end
             end
           end
+
+          context 'when IPAddress is empty but available in Networks' do
+            let(:container_config) do
+              {
+                'HostConfig' => {
+                  'NetworkMode' => 'bridge',
+                },
+                'NetworkSettings' => {
+                  'IPAddress' => '',
+                  'Ports' => {
+                    '22/tcp' => [
+                      {
+                        'HostIp' => '0.0.0.0',
+                        'HostPort' => 8022,
+                      },
+                    ],
+                  },
+                  'Gateway' => '192.0.2.254',
+                  'Networks' => {
+                    'bridge' => {
+                      '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
+              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.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Vox Pupuli
@@ -32,6 +32,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,14 +80,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
@@ -197,14 +211,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.2'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '4'
+      version: '5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Docker hypervisor for Beaker acceptance testing framework
 test_files: []