beaker-docker 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b9f93de9358670645ea7e0c3bf982a7c822b8ca
-  data.tar.gz: 19730ee76587c0e098504bf7bae15627c10f1603
+  metadata.gz: c08f5cd20c40f88ec243742f3471581e3bdedaac
+  data.tar.gz: a51dd89bab315c5bc3061e4c290335ca305c8932
 SHA512:
-  metadata.gz: 78b6a3d9dda05f73f12861c8f3675647b3265428cfa634de30dbd89da20eac938353ecbf44c900079cdc1a7113a9f7304e13915c78c3f39426e1364be9fee0e8
-  data.tar.gz: a88c7fe2fa9ec4655e629e1996310baa0154bfc8c69e7294f0111479c447f3ef878305df2cf14b8c4fcd36b272f761c06fa9181bfa330ed943e51a27f63eded5
+  metadata.gz: b475e8f7ce22f303fbe772749f0176511581ec9b84f3d116ad690fe2c5d318bc4b33b9f68186938bf5715b81e1a5f8b05f2a7833b6a3e469f7970eebfe5068b8
+  data.tar.gz: f7a3654d9252c82362d88be8dcbfa75aa3a546d01f156e65838d0eed1525a17e55c2fbd937c559fb5dba472fce1f02b27282daee917be49d183d52e03ed83c82

data/lib/beaker-docker/version.rb

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

data/lib/beaker/hypervisor/docker.rb

@@ -144,10 +144,9 @@ module Beaker
 
         container = find_container(host)
 
-        # Provisioning - Only provision if:
-        # - provisioning was explicitly requested via options, or
-        # - the host's container can't be found via its name or ID
-        if @options[:provision] || container.nil?
+        # Provisioning - Only provision if the host's container can't be found
+        # via its name or ID
+        if container.nil?
           unless host['mount_folders'].nil?
             container_opts['HostConfig'] ||= {}
             container_opts['HostConfig']['Binds'] = host['mount_folders'].values.map do |mount|
@@ -162,6 +161,10 @@ module Beaker
             end
           end
 
+          if host['docker_env']
+            container_opts['Env'] = host['docker_env']
+          end
+
           if host['docker_cap_add']
             container_opts['HostConfig']['CapAdd'] = host['docker_cap_add']
           end
@@ -172,6 +175,8 @@ module Beaker
 
           @logger.debug("Creating container from image #{image_name}")
           container = ::Docker::Container.create(container_opts)
+        else
+          host['use_existing_container'] = true
         end
 
         if container.nil?
@@ -279,38 +284,44 @@ module Beaker
     def cleanup
       @logger.notify "Cleaning up docker"
       @hosts.each do |host|
-        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
-          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}")
+        # 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
-              ::Docker::Image.remove(image_id)
+              container.kill
+              sleep 2 # avoid a race condition where the root FS can't unmount
             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}")
+              @logger.warn("stop of container #{container.id} failed: #{e.response.body}")
+            end
+            @logger.debug("delete container #{container.id}")
+            begin
+              container.delete
+            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
-          else
-            @logger.warn("Intended to delete the host's docker image, but host['docker_image_id'] was not set")
           end
         end
       end
@@ -498,6 +509,7 @@ module Beaker
 
       return container unless container.nil?
       @logger.debug("Existing container not found")
+      return nil
     end
 
     # return true if we are inside a docker container

metadata

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