docker-armada 2.13.2 → 2.13.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/armada/docker/container.rb +6 -5
- data/spec/docker/container_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: 177be0099cf668e4aa44eebc565c62dc518ed316
|
|
4
|
+
data.tar.gz: f82b8307023639e8066500c7a62357cc9af2e75e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2230f3021521bbe770ad002069a84a5cc4a4829338badc4a7473e4e88a34ce5b49ae9a54183b411500d87d824003dc3a1d98afabb86665949c99ef8e7677455f
|
|
7
|
+
data.tar.gz: 019988986902393988155ee54c1c01202383034856e1abc99809308f7d31021c8d72effe17657b8e741749a93a5cd661f6f09ae7154d0cf7520817463b3b98c5
|
|
@@ -81,6 +81,12 @@ module Armada
|
|
|
81
81
|
end
|
|
82
82
|
end
|
|
83
83
|
|
|
84
|
+
if container_name
|
|
85
|
+
container_config['name'] = container_name
|
|
86
|
+
options[:env_vars][:SERVICE_NAME] = container_name
|
|
87
|
+
#should we do soemthing if container name isnt set?
|
|
88
|
+
end
|
|
89
|
+
|
|
84
90
|
if options[:env_vars]
|
|
85
91
|
container_config['Env'] = options[:env_vars].map { |k,v| "#{k}=#{v}" }
|
|
86
92
|
end
|
|
@@ -93,11 +99,6 @@ module Armada
|
|
|
93
99
|
container_config['VolumesFrom'] = 'parent'
|
|
94
100
|
end
|
|
95
101
|
|
|
96
|
-
if container_name
|
|
97
|
-
container_config['name'] = container_name
|
|
98
|
-
#should we do soemthing if container name isnt set?
|
|
99
|
-
end
|
|
100
|
-
|
|
101
102
|
if options[:restart_policy]
|
|
102
103
|
container_config["RestartPolicy"] = options[:restart_policy]
|
|
103
104
|
end
|
|
@@ -119,7 +119,7 @@ describe Armada::Container do
|
|
|
119
119
|
it { should include("Hostname" => "hostname") }
|
|
120
120
|
it { should include("name" => "some_container") }
|
|
121
121
|
it { should include("ExposedPorts" => { "1111/tcp" => {}, "2222/udp" => {}}) }
|
|
122
|
-
it { should include("Env" => ["KEY=VALUE", "HOST=hostname"]) }
|
|
122
|
+
it { should include("Env" => ["KEY=VALUE", "HOST=hostname", "SERVICE_NAME=some_container"]) }
|
|
123
123
|
it { should include("Volumes" => { "/container/log" => {} }) }
|
|
124
124
|
it { should include("VolumesFrom" => "parent") }
|
|
125
125
|
it { should include("RestartPolicy" => { "MaximumRetryCount" => 5, "Name" => "always" }) }
|
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.3
|
|
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-06-01 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: excon
|