docker-armada 2.13.2 → 2.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1f8444036ef96fc52278b48f467f603848028e4
-  data.tar.gz: d23a2aaae82d89e40ecad6b6ae6a5631dad9b5b6
+  metadata.gz: 177be0099cf668e4aa44eebc565c62dc518ed316
+  data.tar.gz: f82b8307023639e8066500c7a62357cc9af2e75e
 SHA512:
-  metadata.gz: 3dfec474d392c9860caa6d7a44fcff179e8e8b6c67ddff1f3261c3972fd73a94d5410f6928f4fb0ed3a9db061827141e0a53ffce97c040d0d8f26203b8d54edf
-  data.tar.gz: 5e0856a5600d585bfaaad5348862cc48ebfcdbc47fa5a08513c8fa175409d45db7651e18d9882f7bdf2dde3af6d7d50787a0d70b680f92b53d3fb0bb927991b7
+  metadata.gz: 2230f3021521bbe770ad002069a84a5cc4a4829338badc4a7473e4e88a34ce5b49ae9a54183b411500d87d824003dc3a1d98afabb86665949c99ef8e7677455f
+  data.tar.gz: 019988986902393988155ee54c1c01202383034856e1abc99809308f7d31021c8d72effe17657b8e741749a93a5cd661f6f09ae7154d0cf7520817463b3b98c5

data/lib/armada/docker/container.rb

@@ -81,6 +81,12 @@ module Armada
         end
       end
 
+      if container_name
+        container_config['name'] = container_name
+        options[:env_vars][:SERVICE_NAME] = container_name
+        #should we do soemthing if container name isnt set?
+      end
+
       if options[:env_vars]
         container_config['Env'] = options[:env_vars].map { |k,v| "#{k}=#{v}" }
       end
@@ -93,11 +99,6 @@ module Armada
         container_config['VolumesFrom'] = 'parent'
       end
 
-      if container_name
-        container_config['name'] = container_name
-        #should we do soemthing if container name isnt set?
-      end
-
       if options[:restart_policy]
         container_config["RestartPolicy"] = options[:restart_policy]
       end

data/spec/docker/container_spec.rb

@@ -119,7 +119,7 @@ describe Armada::Container do
     it { should include("Hostname"     => "hostname") }
     it { should include("name"         => "some_container") }
     it { should include("ExposedPorts" => { "1111/tcp" => {}, "2222/udp" => {}}) }
-    it { should include("Env"          => ["KEY=VALUE", "HOST=hostname"]) }
+    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" }) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-armada
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.13.3
 platform: ruby
 authors:
 - Jonathan Chauncey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon