beaker-docker 1.5.0 → 2.0.0

data/lib/beaker/hypervisor/docker.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Beaker
+  # Docker hypervisor for Beaker acceptance testing framework
   class Docker < Beaker::Hypervisor
-
     # Docker hypvervisor initializtion
     # Env variables supported:
     # DOCKER_REGISTRY: Docker registry URL
@@ -10,13 +12,14 @@ module Beaker
     #                            or a role (String or Symbol) that identifies one or more hosts.
     # @param [Hash{Symbol=>String}] options Options to pass on to the hypervisor
     def initialize(hosts, options)
+      super
       require 'docker'
       @options = options
       @logger = options[:logger] || Beaker::Logger.new
       @hosts = hosts
 
       # increase the http timeouts as provisioning images can be slow
-      default_docker_options = { :write_timeout => 300, :read_timeout => 300 }.merge(::Docker.options || {})
+      default_docker_options = { write_timeout: 300, read_timeout: 300 }.merge(::Docker.options || {})
       # Merge docker options from the entry in hosts file
       ::Docker.options = default_docker_options.merge(@options[:docker_options] || {})
 
@@ -37,13 +40,12 @@ module Beaker
       ::Docker.logger = @logger
 
       # Find out what kind of remote instance we are talking against
-      if /swarm/.match?(@docker_version['Version'])
+      if @docker_version['Version'].include?('swarm')
         @docker_type = 'swarm'
-        unless ENV['DOCKER_REGISTRY']
-          raise "Using Swarm with beaker requires a private registry. Please setup the private registry and set the 'DOCKER_REGISTRY' env var"
-        else
-          @registry = ENV['DOCKER_REGISTRY']
-        end
+        raise "Using Swarm with beaker requires a private registry. Please setup the private registry and set the 'DOCKER_REGISTRY' env var" unless ENV['DOCKER_REGISTRY']
+
+        @registry = ENV.fetch('DOCKER_REGISTRY', nil)
+
       elsif ::Docker.respond_to?(:podman?) && ::Docker.podman?
         @docker_type = 'podman'
       else
@@ -52,15 +54,15 @@ module Beaker
     end
 
     def install_and_run_ssh(host)
-      def host.enable_root_login(host,opts)
+      def host.enable_root_login(host, _opts)
         logger.debug("Root login already enabled for #{host}")
       end
 
       # If the container is running ssh as its init process then this method
       # will cause issues.
-      if /sshd/.match?(Array(host[:docker_cmd]).first)
+      if Array(host[:docker_cmd]).first&.include?('sshd')
         def host.ssh_service_restart
-          self[:docker_container].exec(%w(kill -1 1))
+          self[:docker_container].exec(%w[kill -1 1])
         end
       end
 
@@ -69,49 +71,45 @@ module Beaker
 
     def get_container_opts(host, image_name)
       container_opts = {}
-      if host['dockerfile']
-        container_opts['ExposedPorts'] = {'22/tcp' => {} }
-      end
-
-      container_opts.merge! ( {
-        'Image' => image_name,
-        'Hostname' => host.name,
-        'HostConfig' => {
-          'PortBindings' => {
-            '22/tcp' => [{ 'HostPort' => rand(1025..9999).to_s, 'HostIp' => '0.0.0.0'}]
-          },
-          'PublishAllPorts' => true,
-          'RestartPolicy' => {
-            'Name' => 'always'
-          }
-        }
-      } )
+      container_opts['ExposedPorts'] = { '22/tcp' => {} } if host['dockerfile']
+
+      container_opts.merge!({
+                              'Image' => image_name,
+                              'Hostname' => host.name,
+                              'HostConfig' => {
+                                'PortBindings' => {
+                                  '22/tcp' => [{ 'HostPort' => rand(1025..9999).to_s, 'HostIp' => '0.0.0.0' }],
+                                },
+                                'PublishAllPorts' => true,
+                                'RestartPolicy' => {
+                                  'Name' => 'always',
+                                },
+                              },
+                            })
     end
 
     def get_container_image(host)
-      @logger.debug("Creating image")
+      @logger.debug('Creating image')
 
-      if host['use_image_as_is']
-        return ::Docker::Image.create('fromImage' => host['image'])
-      end
+      return ::Docker::Image.create('fromImage' => host['image']) if host['use_image_as_is']
 
       dockerfile = host['dockerfile']
       if dockerfile
         # assume that the dockerfile is in the repo and tests are running
         # from the root of the repo; maybe add support for external Dockerfiles
         # with external build dependencies later.
-        if File.exist?(dockerfile)
-          dir = File.expand_path(dockerfile).chomp(dockerfile)
-          return ::Docker::Image.build_from_dir(
-            dir,
-            { 'dockerfile' => dockerfile,
-              :rm => true,
-              :buildargs => buildargs_for(host)
-            }
-          )
-        else
-          raise "Unable to find dockerfile at #{dockerfile}"
-        end
+        raise "Unable to find dockerfile at #{dockerfile}" unless File.exist?(dockerfile)
+
+        dir = File.expand_path(dockerfile).chomp(dockerfile)
+        return ::Docker::Image.build_from_dir(
+          dir,
+          {
+            'dockerfile' => dockerfile,
+            :rm => true,
+            :buildargs => buildargs_for(host),
+          },
+        )
+
       elsif host['use_image_entry_point']
         df = <<-DF
           FROM #{host['image']}
@@ -123,13 +121,12 @@ module Beaker
         return ::Docker::Image.build(df, { rm: true, buildargs: buildargs_for(host) })
       end
 
-      return ::Docker::Image.build(dockerfile_for(host),
-                  { rm: true, buildargs: buildargs_for(host) })
+      ::Docker::Image.build(dockerfile_for(host), { rm: true, buildargs: buildargs_for(host) })
     end
 
     # Nested Docker scenarios
     def nested_docker?
-      ENV['DOCKER_IN_DOCKER'] || ENV['WSLENV']
+      ENV['DOCKER_IN_DOCKER'] || ENV.fetch('WSLENV', nil)
     end
 
     # Find out where the ssh port is from the container
@@ -139,7 +136,7 @@ module Beaker
     def get_ssh_connection_info(container)
       ssh_connection_info = {
         ip: nil,
-        port: nil
+        port: nil,
       }
 
       container_json   = container.json
@@ -149,82 +146,76 @@ 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?(':///') && !nested_docker?
-        ip = URI.parse(ENV['DOCKER_HOST']).host
-      else
+      if @docker_type == 'docker' && ENV.fetch('DOCKER_HOST', nil) && !ENV.fetch('DOCKER_HOST', '').include?(':///') && !nested_docker?
+        ip = URI.parse(ENV.fetch('DOCKER_HOST', nil)).host
+      elsif in_container? && !nested_docker?
         # Swarm or local docker host
-        if in_container? && !nested_docker?
-          gw = network_settings['Gateway']
-          ip = gw unless (gw.nil? || gw.empty?)
-        else
-          # The many faces of container networking
-
-          # Host to Container
-          port22 = network_settings.dig('PortBindings','22/tcp')
-          if port22.nil? && network_settings.key?('Ports') && !nested_docker?
-            port22 = network_settings.dig('Ports','22/tcp')
-          end
+        gw = network_settings['Gateway']
+        ip = gw unless gw.nil? || gw.empty?
+      else
+        # The many faces of container networking
 
-          ip = port22[0]['HostIp'] if port22
-          port = port22[0]['HostPort'] if port22
+        # Host to Container
+        port22 = network_settings.dig('PortBindings', '22/tcp')
+        port22 = network_settings.dig('Ports', '22/tcp') if port22.nil? && network_settings.key?('Ports') && !nested_docker?
 
-          # Container to container
-          unless ip && port
-            ip = network_settings['IPAddress']
-            port = ip && !ip.empty? ? 22 : nil
-          end
+        ip = port22[0]['HostIp'] if port22
+        port = port22[0]['HostPort'] if port22
 
-          # Container through gateway
-          unless ip && port
-            ip = network_settings['Gateway']
+        # Container to container
+        unless ip && port
+          ip = network_settings['IPAddress']
+          port = ip && !ip.empty? ? 22 : nil
+        end
 
-            if ip && !ip.empty?
-              port22 = network_settings.dig('PortBindings','22/tcp')
-              port = port22[0]['HostPort'] if port22
-            else
-              port = nil
-            end
-          end
+        # Container through gateway
+        unless ip && port
+          ip = network_settings['Gateway']
 
-          # Legacy fallback
-          unless ip && port
-            port22 = network_settings.dig('Ports','22/tcp')
-            ip = port22[0]["HostIp"] if port22
+          if ip && !ip.empty?
+            port22 = network_settings.dig('PortBindings', '22/tcp')
             port = port22[0]['HostPort'] if port22
+          else
+            port = nil
           end
         end
+
+        # Legacy fallback
+        unless ip && port
+          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'] if ip.nil?
       else
-        port22 = network_settings.dig('Ports','22/tcp')
+        port22 = network_settings.dig('Ports', '22/tcp')
         port = port22[0]['HostPort'] if port22
       end
 
-      ssh_connection_info[:ip] = (ip == '0.0.0.0') ? '127.0.0.1' : ip
+      ssh_connection_info[:ip] = ip == '0.0.0.0' ? '127.0.0.1' : ip
       ssh_connection_info[:port] = port || '22'
       ssh_connection_info
     end
 
     def provision
-      @logger.notify "Provisioning docker"
+      @logger.notify 'Provisioning docker'
 
       @hosts.each do |host|
         @logger.notify "provisioning #{host.name}"
 
         image = get_container_image(host)
 
-        if host['tag']
-          image.tag({:repo => host['tag']})
-        end
+        image.tag({ repo: host['tag'] }) if host['tag']
 
         if @docker_type == 'swarm'
           image_name = "#{@registry}/beaker/#{image.id}"
-          ret = ::Docker::Image.search(:term => image_name)
+          ret = ::Docker::Image.search(term: image_name)
           if ret.first.nil?
-            @logger.debug("Image does not exist on registry. Pushing.")
-            image.tag({:repo => image_name, :force => true})
+            @logger.debug('Image does not exist on registry. Pushing.')
+            image.tag({ repo: image_name, force: true })
             image.push
           end
         else
@@ -235,8 +226,8 @@ module Beaker
 
         container_opts = get_container_opts(host, image_name)
         if host['dockeropts'] || @options[:dockeropts]
-          dockeropts = host['dockeropts'] ? host['dockeropts'] : @options[:dockeropts]
-          dockeropts.each do |k,v|
+          dockeropts = host['dockeropts'] || @options[:dockeropts]
+          dockeropts.each do |k, v|
             container_opts[k] = v
           end
         end
@@ -251,12 +242,12 @@ module Beaker
             container_opts['HostConfig']['Binds'] = host['mount_folders'].values.map do |mount|
               host_path = File.expand_path(mount['host_path'])
               # When using docker_toolbox and getting a "(Driveletter):/" path, convert windows path to VM mount
-              if ENV['DOCKER_TOOLBOX_INSTALL_PATH'] && host_path =~ /^.\:\//
-                host_path = "/" + host_path.gsub(/^.\:/, host_path[/^(.)/].downcase)
-              end
-              a = [ host_path, mount['container_path'] ]
-              if mount.has_key?('opts')
-                a << mount['opts'] if mount.has_key?('opts')
+              host_path = "/#{host_path.gsub(/^.:/, host_path[/^(.)/].downcase)}" if ENV['DOCKER_TOOLBOX_INSTALL_PATH'] && host_path =~ %r{^.:/}
+              a = [host_path, mount['container_path']]
+
+              # TODO: rewrite this part
+              if mount.key?('opts')
+                a << mount['opts'] if mount.key?('opts')
               else
                 a << mount['opts'] = 'z'
               end
@@ -265,9 +256,7 @@ module Beaker
             end
           end
 
-          if host['docker_env']
-            container_opts['Env'] = host['docker_env']
-          end
+          container_opts['Env'] = host['docker_env'] if host['docker_env']
 
           # Fixup privileges
           #
@@ -282,11 +271,7 @@ module Beaker
             container_opts['HostConfig']['Privileged'] = container_opts['HostConfig']['Privileged'].nil? ? true : container_opts['HostConfig']['Privileged']
           end
 
-          if host['docker_container_name']
-            container_opts['name'] = host['docker_container_name']
-          else
-            container_opts['name'] = ['beaker', host.name, SecureRandom.uuid.split('-').last].join('-')
-          end
+          container_opts['name'] = (host['docker_container_name'] || ['beaker', host.name, SecureRandom.uuid.split('-').last].join('-'))
 
           if host['docker_port_bindings']
             container_opts['ExposedPorts'] = {} if container_opts['ExposedPorts'].nil?
@@ -300,9 +285,9 @@ module Beaker
 
           @logger.debug("Creating container from image #{image_name}")
 
-          ok=false
-          retries=0
-          while(!ok && (retries < 5))
+          ok = false
+          retries = 0
+          while !ok && (retries < 5)
             container = ::Docker::Container.create(container_opts)
 
             ssh_info = get_ssh_connection_info(container)
@@ -312,19 +297,19 @@ module Beaker
               container.delete(force: true)
               container = nil
 
-              retries+=1
+              retries += 1
               next
             end
 
-            ok=true
+            ok = true
           end
         else
           host['use_existing_container'] = true
         end
 
         if container.nil?
-          raise RuntimeError, 'Cannot continue because no existing container ' +
-                              'could be found and provisioning is disabled.'
+          raise 'Cannot continue because no existing container ' \
+                'could be found and provisioning is disabled.'
         end
 
         fix_ssh(container) if @options[:provision] == false
@@ -364,19 +349,19 @@ module Beaker
         host['ip'] = ip
         host['port'] = port
         host['ssh']  = {
-          :password => root_password,
-          :port => port,
-          :forward_agent => forward_ssh_agent,
-          :auth_methods => ['password', 'publickey', 'hostbased', 'keyboard-interactive']
+          password: root_password,
+          port: port,
+          forward_agent: forward_ssh_agent,
+          auth_methods: %w[password publickey hostbased keyboard-interactive],
         }
 
         @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['vm_ip'] = container.json['NetworkSettings']['IPAddress'].to_s
 
         def host.reboot
-          @logger.warn("Rebooting containers is ineffective...ignoring")
+          @logger.warn('Rebooting containers is ineffective...ignoring')
         end
       end
 
@@ -386,92 +371,88 @@ module Beaker
     # This sideloads sshd after a container starts
     def install_ssh_components(container, host)
       case host['platform']
-      when /ubuntu/, /debian/
-        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 /cumulus/
-        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 /ubuntu/, /debian/, /cumulus/
+        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-[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 -A))
-        container.exec(%w(sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*))
+        container.exec(%w[dnf clean all])
+        container.exec(%w[dnf install -y sudo openssh-server openssh-clients])
+        container.exec(%w[ssh-keygen -A])
+        container.exec(%w[sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*])
       when /^el-/, /centos/, /fedora/, /redhat/, /eos/
-        container.exec(%w(yum clean all))
-        container.exec(%w(yum install -y sudo openssh-server openssh-clients))
-        container.exec(%w(ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key))
-        container.exec(%w(ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key))
-        container.exec(%w(sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*))
+        container.exec(%w[yum clean all])
+        container.exec(%w[yum install -y sudo openssh-server openssh-clients])
+        container.exec(%w[ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key])
+        container.exec(%w[ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key])
+        container.exec(%w[sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/*])
       when /opensuse/, /sles/
-        container.exec(%w(zypper -n in openssh))
-        container.exec(%w(ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key))
-        container.exec(%w(ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key))
-        container.exec(%w(sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config))
+        container.exec(%w[zypper -n in openssh])
+        container.exec(%w[ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key])
+        container.exec(%w[ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key])
+        container.exec(%w[sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config])
       when /archlinux/
-        container.exec(%w(pacman --noconfirm -Sy archlinux-keyring))
-        container.exec(%w(pacman --noconfirm -Syu))
-        container.exec(%w(pacman -S --noconfirm openssh))
-        container.exec(%w(ssh-keygen -A))
-        container.exec(%w(sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config))
-        container.exec(%w(systemctl enable sshd))
+        container.exec(%w[pacman --noconfirm -Sy archlinux-keyring])
+        container.exec(%w[pacman --noconfirm -Syu])
+        container.exec(%w[pacman -S --noconfirm openssh])
+        container.exec(%w[ssh-keygen -A])
+        container.exec(%w[sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config])
+        container.exec(%w[systemctl enable sshd])
       when /alpine/
-        container.exec(%w(apk add --update openssh))
-        container.exec(%w(ssh-keygen -A))
+        container.exec(%w[apk add --update openssh])
+        container.exec(%w[ssh-keygen -A])
       else
-        # TODO add more platform steps here
+        # TODO: add more platform steps here
         raise "platform #{host['platform']} not yet supported on docker"
       end
 
       # Make sshd directory, set root password
-      container.exec(%w(mkdir -p /var/run/sshd))
+      container.exec(%w[mkdir -p /var/run/sshd])
       container.exec(['/bin/sh', '-c', "echo root:#{root_password} | chpasswd"])
     end
 
     def cleanup
-      @logger.notify "Cleaning up docker"
+      @logger.notify 'Cleaning up docker'
       @hosts.each do |host|
         # leave the container running if docker_preserve_container is set
         # setting docker_preserve_container also implies docker_preserve_image
         # is set, since you can't delete an image that's the base of a running
         # container
-        unless host['docker_preserve_container']
-          container = find_container(host)
-          if container
-            @logger.debug("stop container #{container.id}")
-            begin
-              container.kill
-              sleep 2 # avoid a race condition where the root FS can't unmount
-            rescue Excon::Errors::ClientError => e
-              @logger.warn("stop of container #{container.id} failed: #{e.response.body}")
-            end
-            @logger.debug("delete container #{container.id}")
-            begin
-              container.delete(force: true)
-            rescue Excon::Errors::ClientError => e
-              @logger.warn("deletion of container #{container.id} failed: #{e.response.body}")
-            end
+        next if host['docker_preserve_container']
+
+        container = find_container(host)
+        if container
+          @logger.debug("stop container #{container.id}")
+          begin
+            container.kill
+            sleep 2 # avoid a race condition where the root FS can't unmount
+          rescue Excon::Errors::ClientError => e
+            @logger.warn("stop of container #{container.id} failed: #{e.response.body}")
+          end
+          @logger.debug("delete container #{container.id}")
+          begin
+            container.delete(force: true)
+          rescue Excon::Errors::ClientError => e
+            @logger.warn("deletion of container #{container.id} failed: #{e.response.body}")
           end
+        end
 
-          # Do not remove the image if docker_preserve_image is set to true, otherwise remove it
-          unless host['docker_preserve_image']
-            image_id = host['docker_image_id']
-
-            if image_id
-              @logger.debug("deleting image #{image_id}")
-              begin
-                ::Docker::Image.remove(image_id)
-              rescue Excon::Errors::ClientError => e
-                @logger.warn("deletion of image #{image_id} failed: #{e.response.body}")
-              rescue ::Docker::Error::DockerError => e
-                @logger.warn("deletion of image #{image_id} caused internal Docker error: #{e.message}")
-              end
-            else
-              @logger.warn("Intended to delete the host's docker image, but host['docker_image_id'] was not set")
-            end
+        # Do not remove the image if docker_preserve_image is set to true, otherwise remove it
+        next if host['docker_preserve_image']
+
+        image_id = host['docker_image_id']
+
+        if image_id
+          @logger.debug("deleting image #{image_id}")
+          begin
+            ::Docker::Image.remove(image_id)
+          rescue Excon::Errors::ClientError => e
+            @logger.warn("deletion of image #{image_id} failed: #{e.response.body}")
+          rescue ::Docker::Error::DockerError => e
+            @logger.warn("deletion of image #{image_id} caused internal Docker error: #{e.message}")
           end
+        else
+          @logger.warn("Intended to delete the host's docker image, but host['docker_image_id'] was not set")
         end
       end
     end
@@ -484,22 +465,20 @@ module Beaker
 
     def buildargs_for(host)
       docker_buildargs = {}
-      docker_buildargs_env = ENV['DOCKER_BUILDARGS']
-      if docker_buildargs_env != nil
-        docker_buildargs_env.split(/ +|\t+/).each do |arg|
-          key,value=arg.split(/=/)
-          if key
-            docker_buildargs[key]=value
-          else
-            @logger.warn("DOCKER_BUILDARGS environment variable appears invalid, no key found for value #{value}" )
-          end
+      docker_buildargs_env = ENV.fetch('DOCKER_BUILDARGS', nil)
+      docker_buildargs_env&.split(/ +|\t+/)&.each do |arg|
+        key, value = arg.split('=')
+        if key
+          docker_buildargs[key] = value
+        else
+          @logger.warn("DOCKER_BUILDARGS environment variable appears invalid, no key found for value #{value}")
         end
       end
-      if docker_buildargs.empty?
-        buildargs = host['docker_buildargs'] || {}
-      else
-        buildargs = docker_buildargs
-      end
+      buildargs = if docker_buildargs.empty?
+                    host['docker_buildargs'] || {}
+                  else
+                    docker_buildargs
+                  end
       @logger.debug("Docker build buildargs: #{buildargs}")
       JSON.generate(buildargs)
     end
@@ -512,7 +491,7 @@ module Beaker
       DF
 
       # Commands before any other commands. Can be used for eg. proxy configuration
-      dockerfile += (host['docker_image_first_commands'] || []).map { |cmd| "RUN #{cmd}\n" }.join('')
+      dockerfile += (host['docker_image_first_commands'] || []).map { |cmd| "RUN #{cmd}\n" }.join
 
       # add platform-specific actions
       service_name = 'sshd'
@@ -585,7 +564,7 @@ module Beaker
       DF
 
       # Any extra commands specified for the host
-      dockerfile += (host['docker_image_commands'] || []).map { |cmd| "RUN #{cmd}\n" }.join('')
+      dockerfile += (host['docker_image_commands'] || []).map { |cmd| "RUN #{cmd}\n" }.join
 
       # Override image entrypoint
       dockerfile += "ENTRYPOINT #{host['docker_image_entrypoint']}\n" if host['docker_image_entrypoint']
@@ -640,24 +619,25 @@ module Beaker
 
       if id
         @logger.debug("Looking for an existing container with ID #{id}")
-        container = containers.select { |c| c.id == id }.first
+        container = containers.find { |c| c.id == id }
       end
 
       if name && container.nil?
         @logger.debug("Looking for an existing container with name #{name}")
-        container = containers.select do |c|
+        container = containers.find do |c|
           c.info['Names'].include? "/#{name}"
-        end.first
+        end
       end
 
       return container unless container.nil?
-      @logger.debug("Existing container not found")
-      return nil
+
+      @logger.debug('Existing container not found')
+      nil
     end
 
     # return true if we are inside a docker container
     def in_container?
-      return File.file?('/.dockerenv')
+      File.file?('/.dockerenv')
     end
   end
 end

data/lib/beaker-docker/version.rb

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