docker-armada 2.13.1 → 2.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578e451ca7c8470b10c91273893ea362864cf094
-  data.tar.gz: dc0ab44c60cdf7cf625b0e0b4b1fd3eec88e5712
+  metadata.gz: c1f8444036ef96fc52278b48f467f603848028e4
+  data.tar.gz: d23a2aaae82d89e40ecad6b6ae6a5631dad9b5b6
 SHA512:
-  metadata.gz: c7f1f861911477540602823b87fa78339327c3d87b9d6907a5ce8c4e020a22b7aeea5231fa594e5873c44d35c75326b796e89a75e555c7e208325f260604c4a1
-  data.tar.gz: 6b1d2293cef350201b6484fdad5cdd68bf764ce6af031da303fb6a277895dc4b5dbe182628b71df00a9dba62536b52f2cd67d0b00f0dc54353fcc3582659066d
+  metadata.gz: 3dfec474d392c9860caa6d7a44fcff179e8e8b6c67ddff1f3261c3972fd73a94d5410f6928f4fb0ed3a9db061827141e0a53ffce97c040d0d8f26203b8d54edf
+  data.tar.gz: 5e0856a5600d585bfaaad5348862cc48ebfcdbc47fa5a08513c8fa175409d45db7651e18d9882f7bdf2dde3af6d7d50787a0d70b680f92b53d3fb0bb927991b7

data/lib/armada/deploy/parallel.rb

@@ -40,16 +40,22 @@ module Armada
             if @options[:health_check] && @options[:health_check_port]
               ports = container.ports
 
-              if ports.empty?
-                raise "No ports exposed for this container. Please expose a port for the health check or use the --no-health-check option!"
-              end
+              # if --net=host, then there will be no ports hash. The container has direct access to the host network
+              if ports
+                if ports.empty?
+                  raise "No ports exposed for this container. Please expose a port for the health check or use the --no-health-check option!"
+                end
 
-              begin
-                health_check_port = ports["#{@options[:health_check_port]}/tcp"][0]["HostPort"]
-              rescue Exception => e
-                raise "Could not find the host port for [#{health_check_port}]. Make sure you put the container port as the :health_check_port."
+                begin
+                  health_check_port = ports["#{@options[:health_check_port]}/tcp"][0]["HostPort"]
+                rescue Exception => e
+                  raise "Could not find the host port for [#{health_check_port}]. Make sure you put the container port as the :health_check_port."
+                end
+              else
+                health_check_port = @options[:health_check_port]
               end
 
+
               health_check = Armada::Connection::HealthCheck.new(
                 health_check_host,
                 health_check_port,

data/lib/armada/deploy/rolling.rb

@@ -45,14 +45,19 @@ module Armada
             if @options[:health_check] && @options[:health_check_port]
               ports = container.ports
 
-              if ports.empty?
-                raise "No ports exposed for this container. Please expose a port for the health check or use the --no-health-check option!"
-              end
+              # if --net=host, then there will be no ports hash. The container has direct access to the host network
+              if ports
+                if ports.empty?
+                  raise "No ports exposed for this container. Please expose a port for the health check or use the --no-health-check option!"
+                end
 
-              begin
-                health_check_port = ports["#{@options[:health_check_port]}/tcp"][0]["HostPort"]
-              rescue Exception => e
-                raise "Could not find the host port for [#{health_check_port}]. Make sure you put the container port as the :health_check_port."
+                begin
+                  health_check_port = ports["#{@options[:health_check_port]}/tcp"][0]["HostPort"]
+                rescue Exception => e
+                  raise "Could not find the host port for [#{health_check_port}]. Make sure you put the container port as the :health_check_port."
+                end
+              else
+                health_check_port = @options[:health_check_port]
               end
 
               health_check = Armada::Connection::HealthCheck.new(

data/spec/connection/docker_spec.rb

@@ -35,7 +35,7 @@ describe Armada::Connection::Docker do
       subject { connection.options }
 
       it { should include(:client_cert, :client_key, :ssl_ca_file, :ssl_verify_peer) }
-      its([:ssl_verify_peer]) { should be_true }
+      its([:ssl_verify_peer]) { should be_false }
     end
 
     context 'disable TLS verify' do

metadata

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