docker-armada 2.13.1 → 2.13.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/armada/deploy/parallel.rb +13 -7
- data/lib/armada/deploy/rolling.rb +12 -7
- data/spec/connection/docker_spec.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c1f8444036ef96fc52278b48f467f603848028e4
|
4
|
+
data.tar.gz: d23a2aaae82d89e40ecad6b6ae6a5631dad9b5b6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3dfec474d392c9860caa6d7a44fcff179e8e8b6c67ddff1f3261c3972fd73a94d5410f6928f4fb0ed3a9db061827141e0a53ffce97c040d0d8f26203b8d54edf
|
7
|
+
data.tar.gz: 5e0856a5600d585bfaaad5348862cc48ebfcdbc47fa5a08513c8fa175409d45db7651e18d9882f7bdf2dde3af6d7d50787a0d70b680f92b53d3fb0bb927991b7
|
@@ -40,16 +40,22 @@ module Armada
|
|
40
40
|
if @options[:health_check] && @options[:health_check_port]
|
41
41
|
ports = container.ports
|
42
42
|
|
43
|
-
if ports.
|
44
|
-
|
45
|
-
|
43
|
+
# if --net=host, then there will be no ports hash. The container has direct access to the host network
|
44
|
+
if ports
|
45
|
+
if ports.empty?
|
46
|
+
raise "No ports exposed for this container. Please expose a port for the health check or use the --no-health-check option!"
|
47
|
+
end
|
46
48
|
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
49
|
+
begin
|
50
|
+
health_check_port = ports["#{@options[:health_check_port]}/tcp"][0]["HostPort"]
|
51
|
+
rescue Exception => e
|
52
|
+
raise "Could not find the host port for [#{health_check_port}]. Make sure you put the container port as the :health_check_port."
|
53
|
+
end
|
54
|
+
else
|
55
|
+
health_check_port = @options[:health_check_port]
|
51
56
|
end
|
52
57
|
|
58
|
+
|
53
59
|
health_check = Armada::Connection::HealthCheck.new(
|
54
60
|
health_check_host,
|
55
61
|
health_check_port,
|
@@ -45,14 +45,19 @@ module Armada
|
|
45
45
|
if @options[:health_check] && @options[:health_check_port]
|
46
46
|
ports = container.ports
|
47
47
|
|
48
|
-
if ports.
|
49
|
-
|
50
|
-
|
48
|
+
# if --net=host, then there will be no ports hash. The container has direct access to the host network
|
49
|
+
if ports
|
50
|
+
if ports.empty?
|
51
|
+
raise "No ports exposed for this container. Please expose a port for the health check or use the --no-health-check option!"
|
52
|
+
end
|
51
53
|
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
54
|
+
begin
|
55
|
+
health_check_port = ports["#{@options[:health_check_port]}/tcp"][0]["HostPort"]
|
56
|
+
rescue Exception => e
|
57
|
+
raise "Could not find the host port for [#{health_check_port}]. Make sure you put the container port as the :health_check_port."
|
58
|
+
end
|
59
|
+
else
|
60
|
+
health_check_port = @options[:health_check_port]
|
56
61
|
end
|
57
62
|
|
58
63
|
health_check = Armada::Connection::HealthCheck.new(
|
@@ -35,7 +35,7 @@ describe Armada::Connection::Docker do
|
|
35
35
|
subject { connection.options }
|
36
36
|
|
37
37
|
it { should include(:client_cert, :client_key, :ssl_ca_file, :ssl_verify_peer) }
|
38
|
-
its([:ssl_verify_peer]) { should
|
38
|
+
its([:ssl_verify_peer]) { should be_false }
|
39
39
|
end
|
40
40
|
|
41
41
|
context 'disable TLS verify' do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: docker-armada
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.13.
|
4
|
+
version: 2.13.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jonathan Chauncey
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2015-
|
13
|
+
date: 2015-05-28 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: excon
|