beaker-docker 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 841111065b59b77771dab0534b4f9e3f3963378c0a0daf27d86330ab0c733f7a
-  data.tar.gz: '025243139d8c52cad6a50cd5fa27e6cea07414cdb278aadb395072bd1897448d'
+  metadata.gz: fce85bc2b4afe7e30f0f4360bf85bbc326bb402dd2296171010fa5746e7afe6d
+  data.tar.gz: 4d18a84114b99e7a1a1ee2aaff38456c20042c36bc67650310cfd4e70b467a76
 SHA512:
-  metadata.gz: 98afc27265b51cd18868d25651e7003e50f9c26785af54ab277d0e9c673d256aad8a2f4b16905e096c1a2917766b247e44c11d75ae7a7f80e8bd6689174325b4
-  data.tar.gz: 3d84cef6317f571b79277c17cd3be523184a04fd81aa97bd7e4f3340417aabc19c2a07bbc339c13529e644efbf2b37f099ed1e41e6072d7f00b847e41b3fbb49
+  metadata.gz: eccead0c6aede25aeacfecafe6a907f3677827e45330a5045b0d503be7cd8abc5b5b35b6769fdad53c534c09cdc5a67491d4bbd27f46c2662f699152008ff535
+  data.tar.gz: e6c12d6f1b4b817b1f05066cd50db6a5b40be1b523c0b289d08ea8491cca9ded1f35d11e510a4b5533a2c07c173300d55302bd3b13edfa407bed86aac886a8a1

data/.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     if: github.repository_owner == 'voxpupuli'
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ruby 3.0
+      - name: Install Ruby 3.3
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.3'
         env:
           BUNDLE_WITHOUT: release
       - name: Build gem

data/.github/workflows/test.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ruby 3.2
+      - name: Install Ruby 3.3
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "3.3"
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rake rubocop
@@ -33,6 +33,7 @@ jobs:
             coverage: "yes"
           - ruby: "3.1"
           - ruby: "3.2"
+          - ruby: "3.3"
     env:
       COVERAGE: ${{ matrix.coverage }}
     name: RSpec - Ruby ${{ matrix.ruby }}
@@ -53,10 +54,10 @@ jobs:
     name: Docker
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ruby 3.2
+      - name: Install Ruby 3.3
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "3.3"
           bundler-cache: true
       - name: Run acceptance tests
         run: bundle exec rake test:acceptance
@@ -84,10 +85,10 @@ jobs:
     name: Podman
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ruby 3.2
+      - name: Install Ruby 3.3
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "3.3"
           bundler-cache: true
       - name: Run acceptance tests
         run: bundle exec rake test:acceptance

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [2.3.0](https://github.com/voxpupuli/beaker-docker/tree/2.3.0) (2024-05-28)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/2.2.1...2.3.0)
+
+**Implemented enhancements:**
+
+- beaker: Allow 6.x [\#135](https://github.com/voxpupuli/beaker-docker/pull/135) ([bastelfreak](https://github.com/bastelfreak))
+- Add Ruby 3.3 to CI matrix [\#134](https://github.com/voxpupuli/beaker-docker/pull/134) ([bastelfreak](https://github.com/bastelfreak))
+
+**Merged pull requests:**
+
+- voxpupuli-rubocop: Use 2.7.0 [\#136](https://github.com/voxpupuli/beaker-docker/pull/136) ([bastelfreak](https://github.com/bastelfreak))
+
+## [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/beaker-docker.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakefs', '>= 1.3', '< 3.0'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.6.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.7.0'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '>= 4', '< 6'
+  s.add_runtime_dependency 'beaker', '>= 4', '< 7'
   s.add_runtime_dependency 'docker-api', '~> 2.1'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
 end

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.3.0'
 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.3.0
 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-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -67,14 +67,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Docker hypervisor for Beaker acceptance testing framework