vx-container_connector 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db21fe3331dbe6a729da8bb12dcf87087fd2ceb3
-  data.tar.gz: 816eda636dc9bdae8a9c361eca41d3ebe4e2a6d4
+  metadata.gz: eae10f077e9c1aeef071e6b40291dce6e9fed3b2
+  data.tar.gz: 44a40ee38498f36ac01a882ee9f6d2c4f3e28131
 SHA512:
-  metadata.gz: d41134848e869821cf8903e929a67c0e91fd474b5c0856191be67f7980ca52a9c41688dc3a5a52b6341025423bfa08c72c6af5c0f92c68628ddb138bffba46be
-  data.tar.gz: 3fd36596e6c37e51e103564349997f649ef87017bf3c50cb87c9039ce925772fbdda9c7dd100573f44c3970ea8a6686faf59ef6e42f4cb223f2609d727ddfab0
+  metadata.gz: ea42fa3c6b221b58628c1f921e37d2b2d474844340a111a5bb3d97d1d12b7cf42011139976a7c9afbba688245d5b026d396169fa351d7039ed95c0e4aa5c42e1
+  data.tar.gz: a4305f503bb7d53093bd59125e0393f2c9d472c2a1fef7fed9ad78564dac0b0bbf6a276bc9fbdbc0b4979a7dc04be9450f12d21a57daca5ff91fddf6f5d2c609

data/lib/vx/container_connector/docker.rb

@@ -15,15 +15,16 @@ module Vx
       include ContainerConnector::Retriable
       include Instrument
 
-      attr_reader :user, :password, :init, :image, :remote_dir, :memory
+      attr_reader :user, :password, :init, :image, :remote_dir, :memory, :memory_swap
 
       def initialize(options = {})
-        @user       = options[:user]        || "vexor"
-        @password   = options[:password]    || "vexor"
-        @init       = options[:init]        || %w{ /sbin/my_init }
-        @image      = options[:image]       || "ubuntu"
-        @remote_dir = options[:remote_dir]  || "/home/#{user}"
-        @memory     = options[:memory].to_i || 0
+        @user        = options[:user]        || "vexor"
+        @password    = options[:password]    || "vexor"
+        @init        = options[:init]        || %w{ /sbin/my_init }
+        @image       = options[:image]       || "ubuntu"
+        @remote_dir  = options[:remote_dir]  || "/home/#{user}"
+        @memory      = options[:memory].to_i
+        @memory_swap = options[:memory_swap].to_i
       end
 
       def start(&block)
@@ -34,9 +35,10 @@ module Vx
 
       def create_container_options
         Default.create_container_options.merge(
-          'Cmd'    => init,
-          'Image'  => image,
-          'Memory' => memory
+          'Cmd'        => init,
+          'Image'      => image,
+          'Memory'     => memory,
+          'MemorySwap' => memory_swap
         )
       end
 

data/lib/vx/container_connector/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module ContainerConnector
-    VERSION = "0.5.5"
+    VERSION = "0.5.6"
   end
 end

data/spec/lib/docker_spec.rb

@@ -62,7 +62,7 @@ describe Vx::ContainerConnector::Docker do
     end
 
     it 'should be successfuly with memory limit' do
-      conn = described_class.new memory: 1024 * 1024 * 10, init: "/bin/sleep 1", image: 'ubuntu'
+      conn = described_class.new memory: 1024 * 1024 * 10, memory_swap: 1024 * 1024 * 20, init: "/bin/sleep 1", image: 'ubuntu'
       rs = nil
       conn.start do |spawner|
         rs = spawner.id

data/vx-container_connector.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'docker-api',      '1.12.0'
+  spec.add_runtime_dependency 'docker-api',      '= 1.15.0'
   spec.add_runtime_dependency 'vx-common-spawn', '= 0.0.8'
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-container_connector
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: vx-common-spawn
   requirement: !ruby/object:Gem::Requirement