docker-armada 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e09a97ff289d801558221773a79b789b7dfe4470
-  data.tar.gz: 8588032a019f0a9202d245b2829020ee9c9efa60
+  metadata.gz: bb783c462e44e65ca207040db91d66cd7ba417ee
+  data.tar.gz: 453509782c1f8231779fe20c042346a59bdabd2e
 SHA512:
-  metadata.gz: afc28e67549fef69833e17fbb2ae5aae82f715afdb475d7e16ce20f817d6c33e750983e19d4f3a86d22b19eca77bf537391cbc5761dce0f134890f20ff45cdaf
-  data.tar.gz: fc5768eca420e28248590783f86611ce28fdfc81c3ec86df94f6267ff952d46e164b8f15ace9a590ea6f5ca151619f21894b8c387576b84ee09c3a4bff00debb
+  metadata.gz: 472d4bf640b73706ec4d754269b8f140ef14fdb268e2ccbeddd66177b8c90bbd5306510756ed2e9702f67e16570ae516dd66a0553c4a90424475bae1236fe1a0
+  data.tar.gz: 44caed441fc25b01c071939a0a1bb17175cce22fe84b965c31f31cdf2a02c68a02330a3c086ee0ca8451882a56e2c1ab7934de4469ba3f8614c58689c36a12df

data/README.md

@@ -159,13 +159,15 @@ If you want to use a create container docker feature not yet exposed through the
 ```ruby
 container_config({ "Cmd" => [ "date" ] })
 ```
-#### Raw Start Container Config
-If you want to use a start container docker feature not yet exposed through the armadafile, you can include a raw start container config, and the rest of the armadafile will be applied on top of it.
+#### Raw Host Container Config
+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.
 
 ```ruby
-start_config({ "VolumesFrom" => [ "other_container" ] })
+host_config({ "VolumesFrom" => [ "other_container" ] })
 ```
 
+** Note - `start_config` has been deprecated use host_config **
+
 ## CLI
 The CLI is written using [Thor](http://whatisthor.com/). Below is current commands that can be executed using the Armada gem.
 

data/lib/armada/deploy_dsl.rb

@@ -133,7 +133,12 @@ module Armada::DeployDSL
   end
 
   def start_config(cfg)
-    set(:start_config, cfg)
+    Armada.ui.warn "This option will be deprecated soon. Use host_config instead."
+    set(:host_config, cfg)
+  end
+
+  def host_config(cfg)
+    set(:host_config, cfg)
   end
 
   def privileged

data/lib/armada/docker/container.rb

@@ -55,7 +55,7 @@ module Armada
     end
 
     def self.create_host_config(options)
-      host_config = options[:start_config] || {}
+      host_config = options[:host_config] || {}
       host_config['Binds'] = options[:binds] if options[:binds] && !options[:binds].empty?
       host_config['PortBindings'] = options[:port_bindings] if options[:port_bindings]
       host_config['PublishAllPorts'] = true

data/spec/docker/container_spec.rb

@@ -25,7 +25,7 @@ describe Armada::Container do
     :binds         => [ "/host/log:/container/log" ],
     :restart_policy => { "MaximumRetryCount" => 5, "Name" => "always" },
     :container_config => { "CreateConfigKey" => "CreateConfigValue" },
-    :start_config => { "StartConfigKey" => "StartConfigValue" },
+    :host_config => { "StartConfigKey" => "StartConfigValue" },
   }}
 
   describe "#stop" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-armada
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Jonathan Chauncey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon