docker-armada 2.2.0 → 2.3.0
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/README.md +5 -3
- data/lib/armada/deploy_dsl.rb +6 -1
- data/lib/armada/docker/container.rb +1 -1
- 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: bb783c462e44e65ca207040db91d66cd7ba417ee
|
4
|
+
data.tar.gz: 453509782c1f8231779fe20c042346a59bdabd2e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 472d4bf640b73706ec4d754269b8f140ef14fdb268e2ccbeddd66177b8c90bbd5306510756ed2e9702f67e16570ae516dd66a0553c4a90424475bae1236fe1a0
|
7
|
+
data.tar.gz: 44caed441fc25b01c071939a0a1bb17175cce22fe84b965c31f31cdf2a02c68a02330a3c086ee0ca8451882a56e2c1ab7934de4469ba3f8614c58689c36a12df
|
data/README.md
CHANGED
@@ -159,13 +159,15 @@ If you want to use a create container docker feature not yet exposed through the
|
|
159
159
|
```ruby
|
160
160
|
container_config({ "Cmd" => [ "date" ] })
|
161
161
|
```
|
162
|
-
#### Raw
|
163
|
-
If you want to use a
|
162
|
+
#### Raw Host Container Config
|
163
|
+
If you want to use a docker feature not yet exposed through the armadafile, you can include a raw host config, and the rest of the armadafile will be applied on top of it.
|
164
164
|
|
165
165
|
```ruby
|
166
|
-
|
166
|
+
host_config({ "VolumesFrom" => [ "other_container" ] })
|
167
167
|
```
|
168
168
|
|
169
|
+
** Note - `start_config` has been deprecated use host_config **
|
170
|
+
|
169
171
|
## CLI
|
170
172
|
The CLI is written using [Thor](http://whatisthor.com/). Below is current commands that can be executed using the Armada gem.
|
171
173
|
|
data/lib/armada/deploy_dsl.rb
CHANGED
@@ -133,7 +133,12 @@ module Armada::DeployDSL
|
|
133
133
|
end
|
134
134
|
|
135
135
|
def start_config(cfg)
|
136
|
-
|
136
|
+
Armada.ui.warn "This option will be deprecated soon. Use host_config instead."
|
137
|
+
set(:host_config, cfg)
|
138
|
+
end
|
139
|
+
|
140
|
+
def host_config(cfg)
|
141
|
+
set(:host_config, cfg)
|
137
142
|
end
|
138
143
|
|
139
144
|
def privileged
|
@@ -55,7 +55,7 @@ module Armada
|
|
55
55
|
end
|
56
56
|
|
57
57
|
def self.create_host_config(options)
|
58
|
-
host_config = options[:
|
58
|
+
host_config = options[:host_config] || {}
|
59
59
|
host_config['Binds'] = options[:binds] if options[:binds] && !options[:binds].empty?
|
60
60
|
host_config['PortBindings'] = options[:port_bindings] if options[:port_bindings]
|
61
61
|
host_config['PublishAllPorts'] = true
|
@@ -25,7 +25,7 @@ describe Armada::Container do
|
|
25
25
|
:binds => [ "/host/log:/container/log" ],
|
26
26
|
:restart_policy => { "MaximumRetryCount" => 5, "Name" => "always" },
|
27
27
|
:container_config => { "CreateConfigKey" => "CreateConfigValue" },
|
28
|
-
:
|
28
|
+
:host_config => { "StartConfigKey" => "StartConfigValue" },
|
29
29
|
}}
|
30
30
|
|
31
31
|
describe "#stop" 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.
|
4
|
+
version: 2.3.0
|
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:
|
13
|
+
date: 2015-01-04 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: excon
|