beaker-docker 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 334f12192e1c187506529fd753491a8aba885ccf5512d2f681b7b659f4b7f525
-  data.tar.gz: ee99cc4537be2eb938639fd4078aa1f95eba859b338531ba206c4035587e103a
+  metadata.gz: a33de485fa44a24ca53428bc873ee91359d6d872abe4d0794a72e037a189aa4c
+  data.tar.gz: 3e58d56f2878a8cfcfea37fb7dbafb10b6ad9a2500b3f1cad069283fb886ddfb
 SHA512:
-  metadata.gz: 9df1580cf398c8b43641d9b06e53be3090d2141fd9a9172c1f1a6290f362b5d02819e720ee05046e024c4051a8201001569663feb7716263616f578b0d66fbac
-  data.tar.gz: 9e1d910176b66e2576cb170f31b80a97491274248a698c89c5925413c35165afc96cd9da9e4ba2acd4fcd1dea548cec5753211ed796ff0e84a91edce9719ce49
+  metadata.gz: 95fbe3d0582ce0ff014441f45f38e3c2d174f02c2eb323236a6b77a236327a9392eea43765e05bef87e26d9600be81d84c29ea2170b35d926aa9f1419bb23b77
+  data.tar.gz: 67533e7a604103891b076a07ddf54808c360ef18833b3a1a094f1681c1ee69676fbeae8bd5db0b483c7c84e7c643c60e78f3aeaefa16b0893223c7261e590d6b

data/CHANGELOG.md

@@ -0,0 +1,31 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on
+[Keep a Changelog](http://keepachangelog.com)
+& makes a strong effort to adhere to
+[Semantic Versioning](http://semver.org).
+
+Tracking in this Changelog began for this project in version 0.8.4.
+If you're looking for changes from before this, refer to the project's
+git logs & PR history.
+
+The headers used in [Keep a Changelog](http://keepachangelog.com) are:
+
+- Added - for new features.
+- Changed - for changes in existing functionality.
+- Deprecated - for soon-to-be removed features.
+- Removed - for now removed features.
+- Fixed - for any bug fixes.
+- Security - in case of vulnerabilities.
+
+# [0.8.4](https://github.com/voxpupuli/beaker/compare/0.8.3...0.8.4) - 03-15-2021
+
+### Fixed
+
+- Use the `docker-api` function `::Docker.rootless?` to see if the container
+  ecosystem is running in `rootless` mode. This reduces false positive
+  failures across the board.
+- Ensure that the correct port and IP is used for local docker connections
+- Added the `force` option to ensure container removal on error

data/Gemfile.local

@@ -1,5 +1,3 @@
 group :acceptance_testing do
-  # Needed for podman testing
-  gem "docker-api", :git => 'https://github.com/trevor-vaughan/docker-api', :branch => 'podman-compat'
   gem "beaker-rspec"
 end

data/README.md

@@ -117,3 +117,5 @@ Please refer to puppetlabs/beaker's [contributing](https://github.com/puppetlabs
 ## Releasing
 
 To release new versions of beaker-docker, please use update `lib/beaker-docker/version.rb` with the new version number. The version should adhere to [semantic version standards](https://semver.org). When in doubt, ask in the `#voxpupuli` channel of the Puppet community Slack or in `#voxpupuli` on irc.freenode.net ([Webinterface](https://webchat.freenode.net/?channels=%23voxpupuli)).
+
+Once the version file has been updated, a contributor can push a new git tag to match and GitHub Actions will do the release to RubyGems.

data/beaker-docker.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
 
   # Run time dependencies
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
-  s.add_runtime_dependency 'docker-api', '< 3.0.0'
+  s.add_runtime_dependency 'docker-api', '~> 2.1'
 
 end
 

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/lib/beaker/hypervisor/docker.rb

@@ -152,11 +152,12 @@ module Beaker
         else
           port22 = network_settings.dig('Ports','22/tcp')
           ip = port22[0]["HostIp"] if port22
+          port = port22[0]['HostPort'] if port22
         end
       end
 
       if host_config['NetworkMode'] != 'slirp4netns' && network_settings['IPAddress'] && !network_settings['IPAddress'].empty?
-        ip = network_settings['IPAddress']
+        ip = network_settings['IPAddress'] if ip.nil?
       else
         port22 = network_settings.dig('Ports','22/tcp')
         port = port22[0]['HostPort'] if port22
@@ -259,10 +260,11 @@ module Beaker
             container = ::Docker::Container.create(container_opts)
 
             ssh_info = get_ssh_connection_info(container)
-            if ssh_info[:ip] == '127.0.0.1' && (ssh_info[:port].to_i < 1024) && (Process.uid != 0)
-              @logger.debug("#{host} was given a port less than 1024 but you are not running as root, retrying")
+            if ::Docker.rootless? && ssh_info[:ip] == '127.0.0.1' && (ssh_info[:port].to_i < 1024)
+              @logger.debug("#{host} was given a port less than 1024 but you are connecting to a rootless instance, retrying")
 
-              container.delete
+              container.delete(force: true)
+              container = nil
 
               retries+=1
               next
@@ -287,7 +289,7 @@ module Beaker
         begin
           container.stats
         rescue StandardError => e
-          container.delete
+          container.delete(force: true)
           raise "Container '#{container.id}' in a bad state: #{e}"
         end
 
@@ -402,7 +404,7 @@ module Beaker
             end
             @logger.debug("delete container #{container.id}")
             begin
-              container.delete
+              container.delete(force: true)
             rescue Excon::Errors::ClientError => e
               @logger.warn("deletion of container #{container.id} failed: #{e.response.body}")
             end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -105,6 +105,10 @@ module Beaker
 
     let (:version) { {"ApiVersion"=>"1.18", "Arch"=>"amd64", "GitCommit"=>"4749651", "GoVersion"=>"go1.4.2", "KernelVersion"=>"3.16.0-37-generic", "Os"=>"linux", "Version"=>"1.6.0"} }
 
+    before :each do
+      allow(::Docker).to receive(:rootless?).and_return(true)
+    end
+
     context 'with connection failure' do
       describe '#initialize' do
         before :each do
@@ -532,8 +536,8 @@ module Beaker
               ENV['DOCKER_HOST'] = nil
               docker.provision
 
-              expect( hosts[0]['ip'] ).to be === '192.0.2.1'
-              expect( hosts[0]['port'] ).to be ===  '22'
+              expect( hosts[0]['ip'] ).to be === '127.0.1.1'
+              expect( hosts[0]['port'] ).to be ===  8022
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -115,16 +115,16 @@ dependencies:
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.1'
 description: For use for the Beaker acceptance testing tool
 email:
 - voxpupuli@groups.io
@@ -138,6 +138,7 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".simplecov"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.local
 - LICENSE