specinfra 2.15.2 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 354af2a8aa1e981ffd779d664fb7042cfd97450b
-  data.tar.gz: 3e445974bb46e3e4b2b51553a7b4126108512e24
+  metadata.gz: 99ea82b3a9db40daa6c614e81c6bd12435804308
+  data.tar.gz: 46729b659476d950ce3119f97b1c9b0ad1bafb1a
 SHA512:
-  metadata.gz: 9484d8e78232770711a7428bac0e8036c62edcc71eb17d5c1f07a35c55532e9a07d6c0f296089b33e4aa866c1dc927dd6c8291634fed3de50f9d885494dcd063
-  data.tar.gz: 098ac81c37baaf7092238823910a23e0c5f15d42d4d1139a45b3103530bc7a396b83ad424953581525f18f20f66a1a51ae9d1afdc734b74fb96d6c016255b9a2
+  metadata.gz: dc6b49468e7cb92a3a24e614a9138cbf6f86ed56112e1c8aed913989463457649af73b9bfa1db57ede536f9631e869e5ed901c87f45091600c70831c58b8b401
+  data.tar.gz: 7c24d74099d82c1bfc350f8fab9cef0e7d4ce54b3855dadcac9cf1f3c22c769702c537b20f75067a9f6500c92bd83424e2ab99d5a5f0b1d37072671dc5ad20bf

data/lib/specinfra/backend/docker.rb

@@ -12,7 +12,9 @@ module Specinfra::Backend
       if image = Specinfra.configuration.docker_image
         @images = []
         @base_image = ::Docker::Image.get(image)
-        create_and_start_container
+
+        env = Specinfra.configuration.env || {}
+        create_and_start_container(env)
         ObjectSpace.define_finalizer(self, proc { cleanup_container })
       elsif container = Specinfra.configuration.docker_container
         @container = ::Docker::Container.get(container)
@@ -47,7 +49,7 @@ module Specinfra::Backend
 
     private
 
-    def create_and_start_container
+    def create_and_start_container(env)
       opts = { 'Image' => current_image.id }
 
       if current_image.json["Config"]["Cmd"].nil?
@@ -55,7 +57,11 @@ module Specinfra::Backend
       end
 
       if path = Specinfra.configuration.path
-        (opts['Env'] ||= {})['PATH'] = path
+        (opts['Env'] ||= []) << "PATH=#{path}"
+      end
+
+      if env
+        opts['Env'] = (opts['Env'] || []) + env.map { |k,v| [k,v].join('=') }
       end
 
       @container = ::Docker::Container.create(opts)

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.15.2"
+  VERSION = "2.16.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.15.2
+  version: 2.16.0
 platform: ruby
 authors:
 - Gosuke Miyashita