beaker-docker 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6209552fba9be50c92f1ab41f05168aba9496fb1
-  data.tar.gz: 7005bd577927536fd0310fafae5019ec0e1934e1
+  metadata.gz: 07fca4dada242e02c4caa429ebd0209cc3911fb9
+  data.tar.gz: 9aa1e6633cfa7c267cb9b47f07d17eee0a540e0d
 SHA512:
-  metadata.gz: 4d8ae66a90bcec770102ec58df4a2ab813e0876af97dce42f296e45b0dc07612830b7d0edb00de1b8d57d734e99b758296603bb01986e494d79fdcd19e4318d6
-  data.tar.gz: bc0a408820e03f065f4723fcae75103abf3fdb305225f247754d591c0538366dd685b007cda74d85d8df321f6c629e2934990ea1850accf89551c6c6d3670e5d
+  metadata.gz: c2eb49d22fb4827aa73774e4dcdbac5c5063f84662db010eb87ae440cfac083b1b7eb50152725225d6d3411f0249ce111497685127d79ec5bacc093359251ba0
+  data.tar.gz: fbd2f2246972460cfb0c8efb0d5db8aac08fbb04f7012a95bb5ca391b2c6d7df32beb192e54b3e9d5b54082347d1b164fbab4cfabdb9a65615137f66bd4c69dc

data/Gemfile

@@ -16,7 +16,7 @@ end
 # We don't put beaker in as a test dependency because we
 # don't want to create a transitive dependency
 group :acceptance_testing do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.0')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
 end
 
 

data/README.md

@@ -4,18 +4,26 @@ Beaker library to use docker hypervisor
 
 # How to use this wizardry
 
-This gem that allows you to use hosts with [docker](docker.md) hypervisor with [beaker](https://github.com/puppetlabs/beaker). 
+This gem that allows you to use hosts with [docker](docker.md) hypervisor with [beaker](https://github.com/puppetlabs/beaker).
 
-### Right Now? (beaker 3.x)
+Beaker will automatically load the appropriate hypervisors for any given hosts file, so as long as your project dependencies are satisfied there's nothing else to do. No need to `require` this library in your tests.
 
-This gem is already included as [beaker dependency](https://github.com/puppetlabs/beaker/blob/master/beaker.gemspec) for you, so you don't need to do anything special to use this gem's functionality with beaker.
+## With Beaker 3.x
 
-### In beaker's Next Major Version? (beaker 4.x)
+This library is included as a dependency of Beaker 3.x versions, so there's nothing to do.
 
-In beaker's next major version, the requirement for beaker-docker will be pulled
-from that repo. When that happens, then the usage pattern will change. In order
-to use this then, you'll need to include beaker-docker as a dependency right
-next to beaker itself.
+## With Beaker 4.x
+
+As of Beaker 4.0, all hypervisor and DSL extension libraries have been removed and are no longer dependencies. In order to use a specific hypervisor or DSL extension library in your project, you will need to include them alongside Beaker in your Gemfile or project.gemspec. E.g.
+
+~~~ruby
+# Gemfile
+gem 'beaker', '~>4.0'
+gem 'beaker-aws'
+# project.gemspec
+s.add_runtime_dependency 'beaker', '~>4.0'
+s.add_runtime_dependency 'beaker-aws'
+~~~
 
 # Spec tests
 

data/beaker-docker.gemspec

@@ -20,7 +20,12 @@ Gem::Specification.new do |s|
   # Testing dependencies
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs', '~> 0.6'
+  # pin fakefs for Ruby < 2.3
+  if RUBY_VERSION < "2.3"
+    s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14'
+  else
+    s.add_development_dependency 'fakefs', '~> 0.6'
+  end
   s.add_development_dependency 'rake', '~> 10.1'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'

data/docker.md

@@ -48,6 +48,32 @@ By default the docker container just runs an sshd which is adequate for 'puppet
     CONFIG:
       type: foss
 
+### Using the entrypoint of an image and not sshd ###
+Instead of using ssh as the CMD for a container, beaker will use the entrypoint already defined if `use_image_entry_point` is used. Beaker will still load ssh onto the container and start it, but ssh will not be the entrypoint for the container. Below is an example of using the puppetserver image.
+
+    HOSTS:
+      puppetserver:
+        platform: ubuntu-1604-x86_64 
+        hypervisor: docker
+        image: puppet/puppetserver-standalone:6.0.1
+        use_image_entry_point: true
+        roles:
+          - master
+    CONFIG:
+      type: foss
+
+### Using dockerfiles with beaker hosts files ###
+Beaker can utilize a dockerfile specified in hosts file; use the `dockerfile` attribute of a host to specify the location of the dockerfile. Beaker will use the directory it is run in to pass as the context for dockerfile DSL commands such as COPY and VOLUME, so make sure the paths are set correctly for the right context.
+
+    HOSTS:
+      ubuntu-12-10:
+        platform: ubuntu-12.10-x64
+        dockerfile: path/to/my/dockerfile
+        hypervisor: docker
+        docker_cmd: '["/sbin/init"]'
+    CONFIG:
+      type: foss
+
 ### Preserve Docker Image ###
 Unless the image configuration changes you might want to keep the Docker image for multiple spec runs. Use `docker_preserve_image` option for a host.
 

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

data/lib/beaker/hypervisor/docker.rb

@@ -50,10 +50,46 @@ module Beaker
       @hosts.each do |host|
         @logger.notify "provisioning #{host.name}"
 
+        container_opts = {}
         @logger.debug("Creating image")
-        image = ::Docker::Image.build(dockerfile_for(host), {
-           :rm => true, :buildargs => buildargs_for(host)
-        })
+          if dockerfile = host['dockerfile']
+            install_and_run_ssh = true
+            container_opts['ExposedPorts'] = {'22/tcp' => {} }
+            # 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)
+              image = ::Docker::Image.build_from_dir(
+                dir,
+                { 'dockerfile' => dockerfile,
+                  :rm => true,
+                  :buildargs => buildargs_for(host)
+                }
+              )
+            else
+              raise "Unable to find dockerfile at #{dockerfile}"
+            end
+          elsif host['use_image_entry_point']
+            install_and_run_ssh = true
+            df = <<-DF
+            FROM #{host['image']}
+            EXPOSE 22
+          DF
+
+            if cmd = host['docker_cmd']
+              df += cmd
+            end
+            image = ::Docker::Image.build(df, {
+              :rm => true, :buildargs => buildargs_for(host)
+            })
+
+          else
+
+          image = ::Docker::Image.build(dockerfile_for(host), {
+             :rm => true, :buildargs => buildargs_for(host)
+          })
+          end
 
         if @docker_type == 'swarm'
           image_name = "#{@registry}/beaker/#{image.id}"
@@ -67,7 +103,7 @@ module Beaker
           image_name = image.id
         end
 
-        container_opts = {
+        container_opts.merge! ( {
           'Image' => image_name,
           'Hostname' => host.name,
           'HostConfig' => {
@@ -80,7 +116,7 @@ module Beaker
               'Name' => 'always'
             }
           }
-        }
+        } )
         if host['dockeropts'] || @options[:dockeropts]
           dockeropts = host['dockeropts'] ? host['dockeropts'] : @options[:dockeropts]
           dockeropts.each do |k,v|
@@ -129,6 +165,12 @@ module Beaker
         @logger.debug("Starting container #{container.id}")
         container.start
 
+        if install_and_run_ssh
+          @logger.notify("Installing ssh components and starting ssh daemon in #{host} container")
+          install_ssh_components(container, host)
+          # run fixssh to configure and start the ssh service
+          fix_ssh(container, host)
+        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
@@ -171,6 +213,50 @@ module Beaker
 
     end
 
+    # 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))
+      when /cumulus/
+        container.exec(%w(apt-get update))
+        container.exec(%w(apt-get install -y openssh-server openssh-client))
+      when /fedora-(2[2-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))
+        container.exec(%w(ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key))
+      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))
+      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))
+      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))
+      when /alpine/
+        container.exec(%w(apk add --update openssh))
+        container.exec(%w(ssh-keygen -A))
+      else
+        # 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(['/bin/sh', '-c', "echo root:#{root_password} | chpasswd"])
+    end
+
     def cleanup
       @logger.notify "Cleaning up docker"
       @hosts.each do |host|
@@ -233,118 +319,110 @@ module Beaker
     end
 
     def dockerfile_for(host)
-      if host['dockerfile'] then
-        @logger.debug("attempting to load user Dockerfile from #{host['dockerfile']}")
-        if File.exist?(host['dockerfile']) then
-          dockerfile = File.read(host['dockerfile'])
-        else
-          raise "requested Dockerfile #{host['dockerfile']} does not exist"
-        end
-      else
-        raise("Docker image undefined!") if (host['image']||= nil).to_s.empty?
-
-        # specify base image
-        dockerfile = <<-EOF
-          FROM #{host['image']}
-          ENV container docker
+      # specify base image
+      dockerfile = <<-EOF
+        FROM #{host['image']}
+        ENV container docker
+      EOF
+
+      # additional options to specify to the sshd
+      # may vary by platform
+      sshd_options = ''
+
+      # add platform-specific actions
+      service_name = "sshd"
+      case host['platform']
+      when /ubuntu/, /debian/
+        service_name = "ssh"
+        dockerfile += <<-EOF
+          RUN apt-get update
+          RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES.join(' ')}
         EOF
-
-        # additional options to specify to the sshd
-        # may vary by platform
-        sshd_options = ''
-
-        # add platform-specific actions
-        service_name = "sshd"
-        case host['platform']
-        when /ubuntu/, /debian/
-          service_name = "ssh"
-          dockerfile += <<-EOF
-            RUN apt-get update
-            RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES.join(' ')}
-          EOF
-          when  /cumulus/
-            dockerfile += <<-EOF
-            RUN apt-get update
-            RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
-          EOF
-        when /fedora-(2[2-9])/
-          dockerfile += <<-EOF
-            RUN dnf clean all
-            RUN dnf install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}
-            RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
-            RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
-          EOF
-        when /^el-/, /centos/, /fedora/, /redhat/, /eos/
+        when  /cumulus/
           dockerfile += <<-EOF
-            RUN yum clean all
-            RUN yum install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}
-            RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
-            RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
-          EOF
-        when /opensuse/, /sles/
-          dockerfile += <<-EOF
-            RUN zypper -n in openssh #{Beaker::HostPrebuiltSteps::SLES_PACKAGES.join(' ')}
-            RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
-            RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
-            RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
-          EOF
-        when /archlinux/
-          dockerfile += <<-EOF
-            RUN pacman --noconfirm -Sy archlinux-keyring
-            RUN pacman --noconfirm -Syu
-            RUN pacman -S --noconfirm openssh #{Beaker::HostPrebuiltSteps::ARCHLINUX_PACKAGES.join(' ')}
-            RUN ssh-keygen -A
-            RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
-            RUN systemctl enable sshd
-          EOF
-        else
-          # TODO add more platform steps here
-          raise "platform #{host['platform']} not yet supported on docker"
-        end
-
-        # Make sshd directory, set root password
+          RUN apt-get update
+          RUN apt-get install -y openssh-server openssh-client #{Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES.join(' ')}
+        EOF
+      when /fedora-(2[2-9])/
         dockerfile += <<-EOF
-          RUN mkdir -p /var/run/sshd
-          RUN echo root:#{root_password} | chpasswd
+          RUN dnf clean all
+          RUN dnf install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}
+          RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
+          RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
         EOF
-
-        # Configure sshd service to allowroot login using password
-        # Also, disable reverse DNS lookups to prevent every. single. ssh
-        # operation taking 30 seconds while the lookup times out.
+      when /^el-/, /centos/, /fedora/, /redhat/, /eos/
         dockerfile += <<-EOF
-          RUN sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config
-          RUN sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config
-          RUN sed -ri 's/^#?UseDNS .*/UseDNS no/' /etc/ssh/sshd_config
+          RUN yum clean all
+          RUN yum install -y sudo openssh-server openssh-clients #{Beaker::HostPrebuiltSteps::UNIX_PACKAGES.join(' ')}
+          RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
+          RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
         EOF
-
-
-        # Any extra commands specified for the host
-        dockerfile += (host['docker_image_commands'] || []).map { |command|
-          "RUN #{command}\n"
-        }.join('')
-
-        # Override image entrypoint
-        if host['docker_image_entrypoint']
-          dockerfile += "ENTRYPOINT #{host['docker_image_entrypoint']}\n"
-        end
-
-        # How to start a sshd on port 22.  May be an init for more supervision
-        # Ensure that the ssh server can be restarted (done from set_env) and container keeps running
-        cmd = host['docker_cmd'] || ["sh","-c","service #{service_name} start ; tail -f /dev/null"]
+      when /opensuse/, /sles/
+        dockerfile += <<-EOF
+          RUN zypper -n in openssh #{Beaker::HostPrebuiltSteps::SLES_PACKAGES.join(' ')}
+          RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
+          RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
+          RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
+        EOF
+      when /archlinux/
         dockerfile += <<-EOF
-          EXPOSE 22
-          CMD #{cmd}
+          RUN pacman --noconfirm -Sy archlinux-keyring
+          RUN pacman --noconfirm -Syu
+          RUN pacman -S --noconfirm openssh #{Beaker::HostPrebuiltSteps::ARCHLINUX_PACKAGES.join(' ')}
+          RUN ssh-keygen -A
+          RUN sed -ri 's/^#?UsePAM .*/UsePAM no/' /etc/ssh/sshd_config
+          RUN systemctl enable sshd
         EOF
+      else
+        # TODO add more platform steps here
+        raise "platform #{host['platform']} not yet supported on docker"
+      end
 
+      # Make sshd directory, set root password
+      dockerfile += <<-EOF
+        RUN mkdir -p /var/run/sshd
+        RUN echo root:#{root_password} | chpasswd
+      EOF
+
+      # Configure sshd service to allowroot login using password
+      # Also, disable reverse DNS lookups to prevent every. single. ssh
+      # operation taking 30 seconds while the lookup times out.
+      dockerfile += <<-EOF
+        RUN sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config
+        RUN sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+        RUN sed -ri 's/^#?UseDNS .*/UseDNS no/' /etc/ssh/sshd_config
+      EOF
+
+
+      # Any extra commands specified for the host
+      dockerfile += (host['docker_image_commands'] || []).map { |command|
+        "RUN #{command}\n"
+      }.join('')
+
+      # Override image entrypoint
+      if host['docker_image_entrypoint']
+        dockerfile += "ENTRYPOINT #{host['docker_image_entrypoint']}\n"
       end
 
+      # How to start a sshd on port 22.  May be an init for more supervision
+      # Ensure that the ssh server can be restarted (done from set_env) and container keeps running
+      cmd = host['docker_cmd'] || ["sh","-c","service #{service_name} start ; tail -f /dev/null"]
+      dockerfile += <<-EOF
+        EXPOSE 22
+        CMD #{cmd}
+      EOF
+
+    # end
+
       @logger.debug("Dockerfile is #{dockerfile}")
       return dockerfile
     end
 
     # a puppet run may have changed the ssh config which would
     # keep us out of the container.  This is a best effort to fix it.
-    def fix_ssh(container)
+    # Optionally pass in a host object to to determine which ssh
+    # restart command we should try.
+    def fix_ssh(container, host=nil)
       @logger.debug("Fixing ssh on container #{container.id}")
       container.exec(['sed','-ri',
                       's/^#?PermitRootLogin .*/PermitRootLogin yes/',
@@ -355,7 +433,13 @@ module Beaker
       container.exec(['sed','-ri',
                       's/^#?UseDNS .*/UseDNS no/',
                       '/etc/ssh/sshd_config'])
-      container.exec(%w(service ssh restart))
+      if host
+        if host['platform'] =~ /alpine/
+          container.exec(%w(/usr/sbin/sshd))
+        else
+          container.exec(%w(service ssh restart))
+        end
+      end
     end
 
 

data/spec/beaker/hypervisor/docker_spec.rb

@@ -163,14 +163,79 @@ module Beaker
       end
     end
 
+    describe '#install_ssh_components' do
+      let(:test_container) { double('container') }
+      let(:host) {hosts[0]}
+      before :each do
+        allow( ::Docker ).to receive(:validate_version!)
+        allow( docker ).to receive(:dockerfile_for)
+      end
+
+      platforms.each do |platform|
+        it 'should call exec at least twice' do
+          host['platform'] = platform
+          expect(test_container).to receive(:exec).at_least(:twice)
+          docker.install_ssh_components(test_container, host)
+        end
+      end
+
+      it 'should accept alpine as valid platform' do
+        host['platform'] = 'alpine-3.8-x86_64'
+        expect(test_container).to receive(:exec).at_least(:twice)
+        docker.install_ssh_components(test_container, host)
+      end
+
+      it 'should raise an error with an unsupported platform' do
+        host['platform'] = 'boogeyman-2000-x86_64'
+        expect{docker.install_ssh_components(test_container, host)}.to raise_error(RuntimeError, /boogeyman/)
+      end
+    end
+
     describe '#provision' do
       before :each do
         allow( ::Docker ).to receive(:validate_version!)
         allow( docker ).to receive(:dockerfile_for)
       end
 
+      context 'when the host has "use_image_entry_point" set to true on the host' do
+
+        before :each do
+          hosts.each do |host|
+            host['use_image_entry_point'] = true
+          end
+        end
+
+        it 'should not call #dockerfile_for but run methods necessary for ssh installation' do
+          expect( docker ).not_to receive(:dockerfile_for)
+          expect( docker ).to receive(:install_ssh_components).exactly(3).times #once per host
+          expect( docker ).to receive(:fix_ssh).exactly(3).times #once per host
+          docker.provision
+        end
+      end
+
+      context 'when the host has a "dockerfile" for the host' do
+
+        before :each do
+          allow( docker ).to receive(:buildargs_for).and_return('buildargs')
+          hosts.each do |host|
+            host['dockerfile'] = 'mydockerfile'
+          end
+        end
+
+        it 'should not call #dockerfile_for but run methods necessary for ssh installation' do
+          allow( File ).to receive(:exist?).with('mydockerfile').and_return(true)
+          allow( ::Docker::Image ).to receive(:build_from_dir).with("/", hash_including(:rm => true, :buildargs => 'buildargs')).and_return(image)
+          expect( docker ).not_to receive(:dockerfile_for)
+          expect( docker ).to receive(:install_ssh_components).exactly(3).times #once per host
+          expect( docker ).to receive(:fix_ssh).exactly(3).times #once per host
+          docker.provision
+        end
+      end
+
       it 'should call dockerfile_for with all the hosts' do
         hosts.each do |host|
+          expect( docker ).not_to receive(:install_ssh_components)
+          expect( docker ).not_to receive(:fix_ssh)
           expect( docker ).to receive(:dockerfile_for).with(host).and_return('')
         end
 
@@ -445,7 +510,7 @@ module Beaker
             host['docker_container_name'] = container_name
 
             expect( ::Docker::Container ).to receive(:all).and_return([container])
-            expect(container).to receive(:exec).exactly(4).times
+            expect(docker).to receive(:fix_ssh).exactly(1).times
           end
           docker.provision
         end
@@ -519,10 +584,6 @@ module Beaker
         expect { docker.send(:dockerfile_for, {'platform' => 'a_sidewalk', 'image' => 'foobar' }) }.to raise_error(/platform a_sidewalk not yet supported/)
       end
 
-      it 'should raise on missing image' do
-        expect { docker.send(:dockerfile_for, {'platform' => 'centos-7-x86_64'})}.to raise_error(/Docker image undefined/)
-      end
-
       it 'should set "ENV container docker"' do
         FakeFS.deactivate!
         platforms.each do |platform|
@@ -595,16 +656,6 @@ module Beaker
 
         expect( dockerfile ).to be =~ /RUN pacman -S --noconfirm openssh/
       end
-
-      it 'should use user dockerfile if specified' do
-        FakeFS.deactivate!
-        dockerfile = docker.send(:dockerfile_for, {
-          'dockerfile' => 'README.md'
-        })
-
-        expect( dockerfile ).to be == File.read('README.md')
-      end
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec