docker-armada 2.11.0 → 2.11.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 +7 -2
- data/lib/armada/deploy/rolling.rb +13 -3
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bd521b7665d0bc23ee295f670702cf4ff42c0741
|
4
|
+
data.tar.gz: 5fb382d231fc0e3d8f0e2a4221dbba6c68119fa9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4e3fd6576ef1c570da8f667e3f633594ab3657a537a509244b23864e445005d6a6ca908dd320df4314e0a754ab9b1f202f36e0e800cb01723d74dc8ed61a4799
|
7
|
+
data.tar.gz: f43a2b30c789d2cca95e7efec04106681e39665be2c57d695374f72f044399ef2929d18b98f5938e2b2cd2edf6faa3dc2d7bf777633296eea3669cc78014657d
|
@@ -14,8 +14,13 @@ module Armada
|
|
14
14
|
|
15
15
|
begin
|
16
16
|
@options[:hosts].each_in_parallel do |host|
|
17
|
-
|
18
|
-
|
17
|
+
if host.is_a? String
|
18
|
+
docker_host_connect_string = host
|
19
|
+
health_check_host = host
|
20
|
+
else
|
21
|
+
docker_host_connect_string = host[:docker_host]
|
22
|
+
health_check_host = host[:health_check_host]
|
23
|
+
end
|
19
24
|
|
20
25
|
docker_host = Armada::Host.create(docker_host_connect_string, options)
|
21
26
|
image = docker_host.get_image @options[:image], @options[:tag], @options
|
@@ -13,14 +13,24 @@ module Armada
|
|
13
13
|
Armada.ui.info "Deploying the following image [#{@options[:image]}:#{@options[:tag]}]"
|
14
14
|
begin
|
15
15
|
@options[:hosts].each_in_parallel do |host|
|
16
|
-
|
16
|
+
if host.is_a? String
|
17
|
+
docker_host_connect_string = host
|
18
|
+
else
|
19
|
+
docker_host_connect_string = host[:docker_host]
|
20
|
+
end
|
17
21
|
docker_host = Armada::Host.create(docker_host_connect_string, options)
|
18
22
|
docker_host.get_image(@options[:image], @options[:tag], @options).pull
|
19
23
|
end
|
20
24
|
|
21
25
|
@options[:hosts].each do |host|
|
22
|
-
|
23
|
-
|
26
|
+
if host.is_a? String
|
27
|
+
docker_host_connect_string = host
|
28
|
+
health_check_host = host
|
29
|
+
else
|
30
|
+
docker_host_connect_string = host[:docker_host]
|
31
|
+
health_check_host = host[:health_check_host]
|
32
|
+
end
|
33
|
+
|
24
34
|
docker_host = Armada::Host.create(docker_host_connect_string, options)
|
25
35
|
image = docker_host.get_image @options[:image], @options[:tag], @options
|
26
36
|
container = Armada::Container.new(image, docker_host, @options)
|