docker-armada 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c6a134ac2db6fadcd7028384e7d3086fae892e
-  data.tar.gz: a988ae753d0eadbd9a3e883acab463fed45fd3f3
+  metadata.gz: 4bd1db4e4111caea27b2e22cee099a3f4ffa7389
+  data.tar.gz: 53cdf914ba11e5c1811e0b7f2a6f9b4542add009
 SHA512:
-  metadata.gz: 06011559d5510f6df1781edc29ee04c025fd093cabce5693f418537f96ed6923fff12a7bf4d612d47f4b4bea5f180ae47a8b0b6f6d5041b54159d5456eb705c3
-  data.tar.gz: b0f5e0c08cdc47c91d69cd19c8c3876496f6dc0d4506202e1050f4c813eb6bb87276c05ae3be6666953cfdf2abf9b03f04eec503fbd63b4943bd31098ab2ad07
+  metadata.gz: 949ad67ada20bfb47a72ec66d58c777398bf3dd4f35bac0577e89876831f6c6aac5c13aaa9a43f113655d43d9635277ab8f0870faa86d2fe7e080cd2aac3150a
+  data.tar.gz: ed6ee879178d6480468d1186de3aeeb9bb0a3ff965f41a1ba90771a3cb1acb5414741852247d7e44a84028a43ced23b4bfad3209032fbd07852f3894e0e9a683

data/lib/armada/deploy/parallel.rb

@@ -7,6 +7,7 @@ module Armada
         @project     = project
         @environment = environment
         @options     = Armada::Configuration.load!(project, environment, options)
+        @declared_hostname = @options[:hostname]
       end
 
       def run
@@ -22,13 +23,17 @@ module Armada
               health_check_host = host[:health_check_host]
             end
 
-            options[:hostname] ||= health_check_host
-
-            docker_host = Armada::Host.create(docker_host_connect_string, options)
+            docker_host = Armada::Host.create(docker_host_connect_string, @options)
             image = docker_host.get_image @options[:image], @options[:tag], @options
             image.pull
 
-            container = Armada::Container.new(image, docker_host, @options)
+            if @declared_hostname
+              local_options = @options
+            else
+              local_options = @options.merge({:hostname => health_check_host})
+            end
+
+            container = Armada::Container.new(image, docker_host, local_options)
             container.stop
             container.start
 

data/lib/armada/deploy/rolling.rb

@@ -7,6 +7,7 @@ module Armada
         @project     = project
         @environment = environment
         @options     = Armada::Configuration.load!(project, environment, options)
+        @declared_hostname = @options[:hostname]
       end
 
       def run
@@ -31,9 +32,11 @@ module Armada
               health_check_host = host[:health_check_host]
             end
 
-            options[:hostname] ||= health_check_host
+            unless @declared_hostname
+              @options[:hostname] = health_check_host
+            end
 
-            docker_host = Armada::Host.create(docker_host_connect_string, options)
+            docker_host = Armada::Host.create(docker_host_connect_string, @options)
             image = docker_host.get_image @options[:image], @options[:tag], @options
             container = Armada::Container.new(image, docker_host, @options)
             container.stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-armada
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Jonathan Chauncey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon