beaker-docker 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de8c341eaa907ce915686f4af31417659a391ace3e844cd10de5b6b3a6f963a
-  data.tar.gz: 533955311e2c5a195bbc884a15dd71ae0a54603097baaf0afc41ca7226fef083
+  metadata.gz: 3f4f7b1cd703a47b1d9e0ef3ee4674fefca4859b051f1a9d3d90cd84e9d00314
+  data.tar.gz: c7a93b50fd1d1c17bf54d58082131e29e6e20837a46ec65e12e013fa1fdb3aca
 SHA512:
-  metadata.gz: a0ae7bb38381077821e427d7f46ff135649ef686b381c4438a6dd046ffec455f32169226f5e7799a52bd7360cca8fd118e06c3db507b55776647a6273736b5c7
-  data.tar.gz: 8250ec4f91378d821e0bbf3cf92a5038971df55f224ac03142148fe2dd8ee8137c6e86f11c94c597d1555e163c664b299076807cf6026eb1b2d6c0beaaadd08c
+  metadata.gz: ffc27af960c9686c3371d52e124a759456d57c64172443c061b573a4ffbb5756529c5ac686e379e707dc0480e495c7b64111745ba5930e3094803a07ed3534b4
+  data.tar.gz: 8633cd8a006ed012159784c42934818162d33a1d5d9062d520ed1152e001773aa1de5701ce3e71de263d25fa5b38d3948b61e12936b26c7a1440c64933e4c315

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [1.0.1](https://github.com/voxpupuli/beaker-docker/tree/1.0.1) (2021-09-13)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/1.0.0...1.0.1)
+
+**Implemented enhancements:**
+
+- Initial EL9 support [\#55](https://github.com/voxpupuli/beaker-docker/pull/55) ([ekohl](https://github.com/ekohl))
+- Add support for additional Docker port bindings [\#54](https://github.com/voxpupuli/beaker-docker/pull/54) ([treydock](https://github.com/treydock))
+
+**Fixed bugs:**
+
+- Fix IP detection in WSL2 environments [\#56](https://github.com/voxpupuli/beaker-docker/pull/56) ([trevor-vaughan](https://github.com/trevor-vaughan))
+- Fix SSH port binding [\#53](https://github.com/voxpupuli/beaker-docker/pull/53) ([treydock](https://github.com/treydock))
+- Added ENV DOCKER\_IN\_DOCKER to fix SSH conn info [\#51](https://github.com/voxpupuli/beaker-docker/pull/51) ([QueerCodingGirl](https://github.com/QueerCodingGirl))
+
+**Closed issues:**
+
+- Regression with 1.0.0 WRT SSH port usage [\#52](https://github.com/voxpupuli/beaker-docker/issues/52)
+
 ## [1.0.0](https://github.com/voxpupuli/beaker-docker/tree/1.0.0) (2021-08-06)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-docker/compare/0.8.4...1.0.0)

data/docker.md

@@ -188,3 +188,7 @@ node available as  ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=
 ```
 
 The tests should then run as normal from there.
+
+
+### Docker-in-Docker (dind) ###
+If you are using docker in docker, set the environment variable DOCKER_IN_DOCKER=true. Beaker-docker will then not try to use the DOCKER_HOST address for the ssh connection to the containers.

data/lib/beaker/hypervisor/docker.rb

@@ -127,6 +127,11 @@ module Beaker
                   { rm: true, buildargs: buildargs_for(host) })
     end
 
+    # Nested Docker scenarios
+    def nested_docker?
+      ENV['DOCKER_IN_DOCKER'] || ENV['WSLENV']
+    end
+
     # Find out where the ssh port is from the container
     # When running on swarm DOCKER_HOST points to the swarm manager so we have to get the
     # IP of the swarm slave via the container data
@@ -144,11 +149,11 @@ module Beaker
       ip = nil
       port = nil
       # Talking against a remote docker host which is a normal docker host
-      if @docker_type == 'docker' && ENV['DOCKER_HOST'] && !ENV.fetch('DOCKER_HOST','').include?(':///')
+      if @docker_type == 'docker' && ENV['DOCKER_HOST'] && !ENV.fetch('DOCKER_HOST','').include?(':///') && !nested_docker?
         ip = URI.parse(ENV['DOCKER_HOST']).host
       else
         # Swarm or local docker host
-        if in_container?
+        if in_container? && !nested_docker?
           gw = network_settings['Gateway']
           ip = gw unless (gw.nil? || gw.empty?)
         else
@@ -156,6 +161,9 @@ module Beaker
 
           # Host to Container
           port22 = network_settings.dig('PortBindings','22/tcp')
+          if port22.nil? && network_settings.key?('Ports')
+            port22 = network_settings.dig('Ports','22/tcp')
+          end
           ip = port22[0]['HostIp'] if port22
           port = port22[0]['HostPort'] if port22
 
@@ -284,6 +292,14 @@ module Beaker
             container_opts['name'] = ['beaker', host.name, SecureRandom.uuid.split('-').last].join('-')
           end
 
+          if host['docker_port_bindings']
+            container_opts['ExposedPorts'] = {} if container_opts['ExposedPorts'].nil?
+            host['docker_port_bindings'].each_pair do |port, bind|
+              container_opts['ExposedPorts'][port.to_s] = {}
+              container_opts['HostConfig']['PortBindings'][port.to_s] = bind
+            end
+          end
+
           ### END CONTAINER OPTIONS MANGLING ###
 
           @logger.debug("Creating container from image #{image_name}")
@@ -382,7 +398,7 @@ module Beaker
         container.exec(%w(apt-get update))
         container.exec(%w(apt-get install -y openssh-server openssh-client))
         container.exec(%w(sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*))
-      when /el-8/, /fedora-(2[2-9]|3[0-9])/
+      when /el-[89]/, /fedora-(2[2-9]|3[0-9])/
         container.exec(%w(dnf clean all))
         container.exec(%w(dnf install -y sudo openssh-server openssh-clients))
         container.exec(%w(ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key))
@@ -519,7 +535,7 @@ module Beaker
           RUN apt-get update
           RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
           EOF
-      when /el-8/, /fedora-(2[2-9]|3)/
+      when /el-[89]/, /fedora-(2[2-9]|3)/
         dockerfile += <<~EOF
           RUN dnf clean all
           RUN dnf install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::RHEL8_PACKAGES.join(' ')}

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -68,7 +68,7 @@ module Beaker
           'Ports' => {
             '22/tcp' => [
               {
-                'HostIp' => '127.0.1.1',
+                'HostIp' => '0.0.0.0',
                 'HostPort' => 8022,
               },
             ],
@@ -476,6 +476,40 @@ module Beaker
           docker.provision
         end
 
+        it 'should create a container with port bindings' do
+          hosts.each_with_index do |host, index|
+            host['docker_port_bindings'] = {
+              '8080/tcp' => [{ 'HostPort' => '8080', 'HostIp' => '0.0.0.0'}]
+            }
+
+            expect( ::Docker::Container ).to receive(:create).with({
+              'ExposedPorts' => {
+                '8080/tcp' => {},
+              },
+              'Image' => image.id,
+              'Hostname' => host.name,
+              'HostConfig' => {
+                'PortBindings' => {
+                  '22/tcp' => [{ 'HostPort' => /\b\d{4}\b/, 'HostIp' => '0.0.0.0'}],
+                  '8080/tcp' => [{ 'HostPort' => '8080', 'HostIp' => '0.0.0.0'}]
+                },
+                'PublishAllPorts' => true,
+                'Privileged' => true,
+                'RestartPolicy' => {
+                  'Name' => 'always'
+                },
+              },
+              'Labels' => {
+                'one' => (index == 2 ? 3 : 1),
+                'two' => (index == 2 ? 4 : 2),
+              },
+              'name' => /\Abeaker-/
+            })
+          end
+
+          docker.provision
+        end
+
         it 'should start the container' do
           expect( container ).to receive(:start)
 
@@ -491,7 +525,7 @@ module Beaker
               ENV['DOCKER_HOST'] = nil
               docker.provision
 
-              expect( hosts[0]['ip'] ).to be === '192.0.2.1'
+              expect( hosts[0]['ip'] ).to be === '127.0.0.1'
               expect( hosts[0]['port'] ).to be ===  8022
             end
 
@@ -507,7 +541,7 @@ module Beaker
               ENV['DOCKER_HOST'] = nil
               docker.provision
 
-              expect( hosts[0]['ip'] ).to be === '192.0.2.1'
+              expect( hosts[0]['ip'] ).to be === '127.0.0.1'
               expect( hosts[0]['port'] ).to be === 8022
               expect( hosts[0]['ssh'][:password] ).to be ===  'root'
               expect( hosts[0]['ssh'][:port] ).to be ===  8022
@@ -537,8 +571,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.0.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: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Vox Pupuli
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec