docker-armada 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb783c462e44e65ca207040db91d66cd7ba417ee
-  data.tar.gz: 453509782c1f8231779fe20c042346a59bdabd2e
+  metadata.gz: c6ee2bb0cf4d7683be0c8382e1eee0850a85752d
+  data.tar.gz: 7b66e9f9eb0e49402c14330d312e016af44ff634
 SHA512:
-  metadata.gz: 472d4bf640b73706ec4d754269b8f140ef14fdb268e2ccbeddd66177b8c90bbd5306510756ed2e9702f67e16570ae516dd66a0553c4a90424475bae1236fe1a0
-  data.tar.gz: 44caed441fc25b01c071939a0a1bb17175cce22fe84b965c31f31cdf2a02c68a02330a3c086ee0ca8451882a56e2c1ab7934de4469ba3f8614c58689c36a12df
+  metadata.gz: 1f0618ce91e4b08b87691cbc36aeafaca2fabeccc044748b22d1f37a81bba0b57daf2aba84580a3b3b15bcd867dd215fb50ed804feb18f708692d05744a86de2
+  data.tar.gz: c665d63fa19b318ca8bcb4dc48c41798d137901adf9fb2e1a9aaefbfab4bfe30b09a8671af5943da179c67077c20db0953ec6e82721146490ea97e76a0658cd7

data/README.md

@@ -110,6 +110,14 @@ Examples:
 host 'bld-docker-01:4243'
 ```
 
+#### hostname - Set the hostname for the container
+The `hostname` method takes 1 parameter which is a string container the hostname you wish to apply to the container being started. If you do not call `hostname` it will use the `host` value as the hostname.
+
+Examples
+```ruby
+hostname 'myhomename'
+```
+
 **You can call this method multiple times to specify multiple hosts**
 
 #### container_name - Override the container name

data/lib/armada/deploy_dsl.rb

@@ -55,6 +55,7 @@ module Armada::DeployDSL
   def set_current_environment(environment)
     env[:current_environment] = environment
     env[environment] ||= {}
+    env_vars ENVIRONMENT: environment.to_s.downcase
   end
 
   def current_environment
@@ -84,6 +85,10 @@ module Armada::DeployDSL
     set(:hosts, current)
   end
 
+  def hostname(hostname)
+    set(:hostname, hostname)
+  end
+
   def localhost
     # DOCKER_HOST is like 'tcp://127.0.0.1:4243'
     docker_host_uri = URI.parse(ENV['DOCKER_HOST'] || "tcp://127.0.0.1")

data/lib/armada/docker/container.rb

@@ -65,9 +65,10 @@ module Armada
 
     def self.create_container_config(image_id, container_name, host, options = {})
       container_config = options[:container_config] || {}
+      options[:env_vars][:HOST] = host
 
       container_config['Image'] = image_id || options[:image]
-      container_config['Hostname'] = host
+      container_config['Hostname'] = options[:hostname] || host
 
       if options[:port_bindings]
         container_config['ExposedPorts'] ||= {}

data/spec/docker/container_spec.rb

@@ -109,7 +109,7 @@ describe Armada::Container do
     it { should include("Hostname"     => "hostname") }
     it { should include("name"         => "some_container") }
     it { should include("ExposedPorts" => { "1111/tcp" => {}, "2222/udp" => {}}) }
-    it { should include("Env"          => ["KEY=VALUE"]) }
+    it { should include("Env"          => ["KEY=VALUE", "HOST=hostname"]) }
     it { should include("Volumes"      => { "/container/log" => {}}) }
     it { should include("VolumesFrom"  => "parent") }
     it { should include("RestartPolicy" => { "MaximumRetryCount" => 5, "Name" => "always" }) }

metadata

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