beaker-docker 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64566eeaece32a9571e797f4c09a5e56babbcd1d
-  data.tar.gz: b7746e663d8fb916ebb7820fea64ab9f55babe8b
+  metadata.gz: 7b9f93de9358670645ea7e0c3bf982a7c822b8ca
+  data.tar.gz: 19730ee76587c0e098504bf7bae15627c10f1603
 SHA512:
-  metadata.gz: ffcf6fd38005a3f28868b00de297205dbc5df5407764758115017fdd391f42797bc1d5866ee42136af7749fa8ba4555130e406f415af4216c662f19795c587e9
-  data.tar.gz: ac43c591842f18a1cf1841cff074a1cca1393fab223a43e1e26b87fc9812138609c526ca51f46afa5ee87d6979a46c5318b50f11e0ac304054562802f7247d77
+  metadata.gz: 78b6a3d9dda05f73f12861c8f3675647b3265428cfa634de30dbd89da20eac938353ecbf44c900079cdc1a7113a9f7304e13915c78c3f39426e1364be9fee0e8
+  data.tar.gz: a88c7fe2fa9ec4655e629e1996310baa0154bfc8c69e7294f0111479c447f3ef878305df2cf14b8c4fcd36b272f761c06fa9181bfa330ed943e51a27f63eded5

data/lib/beaker-docker/version.rb

@@ -1,3 +1,3 @@
 module BeakerDocker
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/beaker/hypervisor/docker.rb

@@ -44,56 +44,84 @@ module Beaker
 
     end
 
+    def install_and_run_ssh(host)
+      host['dockerfile'] || host['use_image_entry_point']
+    end
+
+    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.to_s[2..5], 'HostIp' => '0.0.0.0'}]
+          },
+          'PublishAllPorts' => true,
+          'Privileged' => true,
+          'RestartPolicy' => {
+            'Name' => 'always'
+          }
+        }
+      } )
+    end
+
+    def get_container_image(host)
+      @logger.debug("Creating image")
+
+      if host['use_image_as_is']
+        return ::Docker::Image.create('fromImage' => host['image'])
+      end
+
+      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
+      elsif host['use_image_entry_point']
+        df = <<-DF
+          FROM #{host['image']}
+          EXPOSE 22
+        DF
+
+        cmd = host['docker_cmd']
+        df += cmd if cmd
+        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) })
+    end
+
     def provision
       @logger.notify "Provisioning docker"
 
       @hosts.each do |host|
         @logger.notify "provisioning #{host.name}"
 
-        container_opts = {}
-        @logger.debug("Creating image")
-
-        dockerfile = host['dockerfile']
-        if 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
-
-          cmd = host['docker_cmd']
-          df += cmd if cmd
 
-          image = ::Docker::Image.build(df, { rm: true, buildargs: buildargs_for(host) })
+        image = get_container_image(host)
 
-        else
-
-          image = ::Docker::Image.build(dockerfile_for(host),
-                                        { rm: true, buildargs: buildargs_for(host) })
+        if host['tag']
+          image.tag({:repo => host['tag']})
         end
 
-          if host['tag']
-            image.tag({:repo => host['tag']})
-          end
-
         if @docker_type == 'swarm'
           image_name = "#{@registry}/beaker/#{image.id}"
           ret = ::Docker::Image.search(:term => image_name)
@@ -106,20 +134,7 @@ module Beaker
           image_name = image.id
         end
 
-        container_opts.merge! ( {
-          'Image' => image_name,
-          'Hostname' => host.name,
-          'HostConfig' => {
-            'PortBindings' => {
-              '22/tcp' => [{ 'HostPort' => rand.to_s[2..5], 'HostIp' => '0.0.0.0'}]
-            },
-            'PublishAllPorts' => true,
-            'Privileged' => true,
-            'RestartPolicy' => {
-              'Name' => 'always'
-            }
-          }
-        } )
+        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|
@@ -169,7 +184,7 @@ module Beaker
         @logger.debug("Starting container #{container.id}")
         container.start
 
-        if install_and_run_ssh
+        if install_and_run_ssh(host)
           @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

data/spec/beaker/hypervisor/docker_spec.rb

@@ -100,6 +100,7 @@ module Beaker
       allow( ::Docker ).to receive(:logger=)
       allow( ::Docker ).to receive(:version).and_return(version)
       allow( ::Docker::Image ).to receive(:build).and_return(image)
+      allow( ::Docker::Image ).to receive(:create).and_return(image)
       allow( ::Docker::Container ).to receive(:create).and_return(container)
       allow_any_instance_of( ::Docker::Container ).to receive(:start)
     end
@@ -244,6 +245,19 @@ module Beaker
         end
       end
 
+      it 'should call image create for hosts when use_image_as_is is defined' do
+        hosts.each do |host|
+          host['use_image_as_is'] = true
+          expect( docker ).not_to receive(:install_ssh_components)
+          expect( docker ).not_to receive(:fix_ssh)
+          expect( ::Docker::Image ).to receive(:create).with('fromImage' => host['image']) #once per host
+          expect( ::Docker::Image ).not_to receive(:build)
+          expect( ::Docker::Image ).not_to receive(:build_from_dir)
+        end
+
+        docker.provision
+      end
+
       it 'should call dockerfile_for with all the hosts' do
         hosts.each do |host|
           expect( docker ).not_to receive(:install_ssh_components)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-docker
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec