docker-armada 2.13.3 → 2.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 177be0099cf668e4aa44eebc565c62dc518ed316
-  data.tar.gz: f82b8307023639e8066500c7a62357cc9af2e75e
+  metadata.gz: d6e983153003088a3a585f182746fedce359b270
+  data.tar.gz: 4901f8a8d6a89e3bba255864d6994399efccbad0
 SHA512:
-  metadata.gz: 2230f3021521bbe770ad002069a84a5cc4a4829338badc4a7473e4e88a34ce5b49ae9a54183b411500d87d824003dc3a1d98afabb86665949c99ef8e7677455f
-  data.tar.gz: 019988986902393988155ee54c1c01202383034856e1abc99809308f7d31021c8d72effe17657b8e741749a93a5cd661f6f09ae7154d0cf7520817463b3b98c5
+  metadata.gz: d6631363893189ccd923dfcbb015c3ae874c3e3e7bab13c6e21598e701ce67e79895e056da49083657a02e2eb4be71d31c0a30d3779519765cd7fca963ccc8f9
+  data.tar.gz: e21a00c577deb155240a95fc5f6314ee9fcd3ce9f6b716757b64feedfa3ef03e5078e9334e9ef738ba909b76cbaf399581a68397d225d4248c06397547cae828

data/lib/armada/docker/container.rb

@@ -27,7 +27,7 @@ module Armada
 
     def start
       info "Creating new container for image - #{@image.name}:#{@image.tag} with image id (#{@image.id}) with container name #{@name}"
-      container_config = Armada::Container.create_container_config(@image.id, @name, @docker_host.host, @options)
+      container_config = Armada::Container.create_container_config(@image.name, @name, @docker_host.host, @options)
       begin
         @container = create(container_config)
         @id = @container.id
@@ -64,6 +64,8 @@ module Armada
       host_config['PortBindings'] = options[:port_bindings] if options[:port_bindings]
       host_config['PublishAllPorts'] = true
       host_config['Privileged'] = options[:privileged] || false
+      host_config["RestartPolicy"] = options[:restart_policy] || nil
+
       host_config
     end
 
@@ -96,11 +98,6 @@ module Armada
           memo[v.split(/:/).last] = {}
           memo
         end
-        container_config['VolumesFrom'] = 'parent'
-      end
-
-      if options[:restart_policy]
-        container_config["RestartPolicy"] = options[:restart_policy]
       end
 
       container_config

data/spec/docker/container_spec.rb

@@ -121,8 +121,6 @@ describe Armada::Container do
     it { should include("ExposedPorts" => { "1111/tcp" => {}, "2222/udp" => {}}) }
     it { should include("Env"          => ["KEY=VALUE", "HOST=hostname", "SERVICE_NAME=some_container"]) }
     it { should include("Volumes"      => { "/container/log" => {} }) }
-    it { should include("VolumesFrom"  => "parent") }
-    it { should include("RestartPolicy" => { "MaximumRetryCount" => 5, "Name" => "always" }) }
     it { should include("CreateConfigKey" => "CreateConfigValue") }
   end
 
@@ -133,6 +131,7 @@ describe Armada::Container do
                                     "2222/udp" => [{"HostIp" => "0.0.0.0", "HostPort" => "2222"}]}) }
     it { should include("PublishAllPorts" => true) }
     it { should include("StartConfigKey" => "StartConfigValue") }
+    it { should include("RestartPolicy" => { "MaximumRetryCount" => 5, "Name" => "always" }) }
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-armada
 version: !ruby/object:Gem::Version
-  version: 2.13.3
+  version: 2.13.4
 platform: ruby
 authors:
 - Jonathan Chauncey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Deploy utility for docker containers