docker-armada 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c150fa04f0e0b192a7448dfd2078e0864933d8
-  data.tar.gz: 2dacba541fc78458bf0e8ca959c984b7ba7c1d7c
+  metadata.gz: e09a97ff289d801558221773a79b789b7dfe4470
+  data.tar.gz: 8588032a019f0a9202d245b2829020ee9c9efa60
 SHA512:
-  metadata.gz: 6244a27c059b902ce09bcb4d33c65e25e1c31cd0e6e059de6b497bb2a69964f7b04cca951a2a0f7465a1d3802acf7cb6415a6d17dedc0871de7f68e8cf8b99db
-  data.tar.gz: f393c42b0629b44935369e3c4099ba4412749c16f52713e9b30f2cb1dabf1f1bb6ba569224cf210ca0b8a5445de69152085f39a38db1d0a1584e96c82b72bd68
+  metadata.gz: afc28e67549fef69833e17fbb2ae5aae82f715afdb475d7e16ce20f817d6c33e750983e19d4f3a86d22b19eca77bf537391cbc5761dce0f134890f20ff45cdaf
+  data.tar.gz: fc5768eca420e28248590783f86611ce28fdfc81c3ec86df94f6267ff952d46e164b8f15ace9a590ea6f5ca151619f21894b8c387576b84ee09c3a4bff00debb

data/README.md

@@ -8,7 +8,7 @@
 Armada is a docker deployment tool which we originally forked from the [NewRelic Centurion](https://github.com/newrelic/centurion) project. It has since seen a huge refactor occur where we started using the [swipely/docker-api](https://github.com/swipely/docker-api) gem for interacting with our docker hosts instead of the mix of docker-cli and api calls that Centurion makes. The DSL is largely unchanged as it works really well for our intended purposes.
 
 ## Disclaimer
-This gem is used in production for deployments at Rally Software. We like the structure it gives us and the simplicity of the DSL. If you feel that we are missing something please open an issue and let's have a discussion about it. If you find a bug please submit an issue and if possible a reproducible test case. 
+This gem is used in production for deployments at Rally Software. We like the structure it gives us and the simplicity of the DSL. If you feel that we are missing something please open an issue and let's have a discussion about it. If you find a bug please submit an issue and if possible a reproducible test case.
 
 ## Installation
 
@@ -153,12 +153,18 @@ Armada can perform a http health check for your application. There are 4 pieces
 
 **health_check_port will work even if you do not specify a contianer -> host port mapping. Armada will determine the dynamically assigned port to the expected container health check port and use that when performing the health check.**
 
-#### Raw Container Config
-If you want to use a docker feature not yet exposed through the armadafile, you can include a raw container config, and the rest of the armadafile will be applied on top of it.
+#### Raw Create Container Config
+If you want to use a create container docker feature not yet exposed through the armadafile, you can include a raw container config, and the rest of the armadafile will be applied on top of it.
 
 ```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.
+
+```ruby
+start_config({ "VolumesFrom" => [ "other_container" ] })
+```
 
 ## CLI
 The CLI is written using [Thor](http://whatisthor.com/). Below is current commands that can be executed using the Armada gem.
@@ -266,7 +272,7 @@ This will remove all images that are considered "orphaned". This means they are
 ```bash
 bld-docker-01 -- unable to remove image 9d535e81db1e because of the following error - Expected([200, 201, 202, 203, 204, 304]) <=> Actual(409 Conflict)
 ```
-This is because it is not the parent image. We are working to resolve this problem. You may also have to run this command a few times to get all the images cleaned up. 
+This is because it is not the parent image. We are working to resolve this problem. You may also have to run this command a few times to get all the images cleaned up.
 
 Options:
 * `hosts` - The list of hosts you wish to perform this action against

data/lib/armada/deploy_dsl.rb

@@ -132,6 +132,10 @@ module Armada::DeployDSL
     set(:container_config, cfg)
   end
 
+  def start_config(cfg)
+    set(:start_config, cfg)
+  end
+
   def privileged
     set(:privileged, true)
   end

data/lib/armada/docker/container.rb

@@ -55,7 +55,7 @@ module Armada
     end
 
     def self.create_host_config(options)
-      host_config = {}
+      host_config = options[:start_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

@@ -23,7 +23,9 @@ describe Armada::Container do
                         "2222/udp" => [{"HostIp" => "0.0.0.0", "HostPort" => "2222"}]},
     :env_vars      => { "KEY" => "VALUE" },
     :binds         => [ "/host/log:/container/log" ],
-    :restart_policy => { "MaximumRetryCount" => 5, "Name" => "always" }
+    :restart_policy => { "MaximumRetryCount" => 5, "Name" => "always" },
+    :container_config => { "CreateConfigKey" => "CreateConfigValue" },
+    :start_config => { "StartConfigKey" => "StartConfigValue" },
   }}
 
   describe "#stop" do
@@ -111,6 +113,7 @@ describe Armada::Container do
     it { should include("Volumes"      => { "/container/log" => {}}) }
     it { should include("VolumesFrom"  => "parent") }
     it { should include("RestartPolicy" => { "MaximumRetryCount" => 5, "Name" => "always" }) }
+    it { should include("CreateConfigKey" => "CreateConfigValue") }
   end
 
   describe ".create_host_config" do
@@ -119,6 +122,7 @@ describe Armada::Container do
     it { should include("PortBindings" => {"1111/tcp" => [{"HostIp" => "0.0.0.0", "HostPort" => "1111"}],
                                     "2222/udp" => [{"HostIp" => "0.0.0.0", "HostPort" => "2222"}]}) }
     it { should include("PublishAllPorts" => true) }
+    it { should include("StartConfigKey" => "StartConfigValue") }
   end
 
 end

metadata

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