hoosegow 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e39782e9a5c8b68841412a3c05965f2f1fff65930971832c821f387250e24679
-  data.tar.gz: 8dc38e89647af50f078a7a1e14e2e4f8834c13a4ebeafbacb1044ee93fc125db
+SHA1:
+  metadata.gz: 615d6ccef6061219fdf2537bc99e1ead31ab30e8
+  data.tar.gz: d3fc67b40b2866d1ea76138c13c14228d0fd700b
 SHA512:
-  metadata.gz: 32625371ed542ffec17e775e837bd946db3717aea5f810236c2f1d44614c09469d68ea3073dcc87c035e7d4b7080b1e22727388990283994754b4feb49d3d996
-  data.tar.gz: 8404be59505bf62095bba370d4f61dedc2b88ba912c7eb22ae08d5e316a90f201e3f7f8bfb6b05a5901c89fc7dfa2e9f726e60d61febd69a6c7ceddefabc75aa
+  metadata.gz: 58a899e06faee750afc8b43a120f702cdfb417d0a67e66672ddbb6d1366b3d1b97aae0946ec1155d49c3289d587026935231927b01cf36a98faad89c55aea9a3
+  data.tar.gz: 521df958416b7f6a213ca2ef7d452f7f924074bca01b1bd1cf78ad45118fcb60bf300622c6b661127fb060c905b70dc2fcff67c1bd7237302bcfe16685ca9b82

data/hoosegow.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hoosegow'
-  s.version     = '1.2.6'
+  s.version     = '1.2.7'
   s.summary     = "A Docker jail for ruby code"
   s.description = "Hoosegow provides an RPC layer on top of Docker containers so that you can isolate unsafe parts of your application."
   s.authors     = ["Ben Toews", "Matt Burke"]

data/lib/hoosegow/docker.rb

@@ -79,13 +79,15 @@ class Hoosegow
     #
     # Returns nothing.
     def create_container(image)
+      create_options = default_container_options(image)
+
+      # Merge in additional :HostConfig options into default options
+      if @container_options.has_key?(:HostConfig)
+        create_options[:HostConfig].merge!(@container_options[:HostConfig])
+      end
+
       @container = ::Docker::Container.create @container_options.merge(
-        :StdinOnce  => true,
-        :OpenStdin  => true,
-        :HostConfig => {
-          :Binds    => volumes_for_bind
-        },
-        :Image     => image
+        create_options
       )
       callback @after_create
     end
@@ -172,6 +174,19 @@ class Hoosegow
     end
 
   private
+
+    # Private: Default options used to create containers
+    def default_container_options(image)
+      {
+        :StdinOnce  => true,
+        :OpenStdin  => true,
+        :HostConfig => {
+          :Binds    => volumes_for_bind
+        },
+        :Image     => image
+      }
+    end
+
     # Private: Set the docker URL, if related options are present.
     def set_docker_url!(options)
       if url = docker_url(options)

data/spec/hoosegow_docker_spec.rb

@@ -64,6 +64,38 @@ describe Hoosegow::Docker do
     end
   end
 
+  context "with custom connection options" do
+    before(:each) {
+      FileUtils.remove_dir(test_dir, true)
+      FileUtils.mkpath(test_dir)
+    }
+    after { FileUtils.remove_dir(test_dir, true) }
+
+    let(:test_dir) { File.join(Dir.pwd, 'volume-test') }
+
+    it "configures ExtraHosts option" do
+      config = CONFIG.merge(
+        :Entrypoint => ['/bin/sh',  '-c', 'getent hosts some-service > /volume-test/out.txt'],
+        :volumes => { '/volume-test' => test_dir + ":rw"},
+        :HostConfig => {
+          :ExtraHosts => ["some-service:127.0.0.1"]
+        }
+      )
+      docker = Hoosegow::Docker.new(config)
+      begin
+        docker.create_container CONFIG[:image_name]
+        docker.start_container
+      ensure
+        docker.stop_container
+        docker.delete_container
+      end
+
+      # Ensure ExtraHosts config is set
+      contents = File.read(File.join(test_dir, 'out.txt'))
+      expect(contents).to match("127.0.0.1\s+some-service")
+    end
+  end
+
 
   context 'docker_url' do
     it "correctly generates TCP urls" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoosegow
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Ben Toews
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: A Docker jail for ruby code