docker-armada 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6ee2bb0cf4d7683be0c8382e1eee0850a85752d
-  data.tar.gz: 7b66e9f9eb0e49402c14330d312e016af44ff634
+  metadata.gz: 3a2f5310391f2084d5d296b0b548998ec13af230
+  data.tar.gz: f44750dbb09b63886daeb448fe839e77ba1b9261
 SHA512:
-  metadata.gz: 1f0618ce91e4b08b87691cbc36aeafaca2fabeccc044748b22d1f37a81bba0b57daf2aba84580a3b3b15bcd867dd215fb50ed804feb18f708692d05744a86de2
-  data.tar.gz: c665d63fa19b318ca8bcb4dc48c41798d137901adf9fb2e1a9aaefbfab4bfe30b09a8671af5943da179c67077c20db0953ec6e82721146490ea97e76a0658cd7
+  metadata.gz: 16d255a647af783034fa5723711d94f0465b80b3e0fe0c8e6de6cce4eb480473a0c3649c7a9c4c91b60316e341b264109edcbbd633a19653708a1ced0219ac5a
+  data.tar.gz: 5cf9fee2ca6bcce102ed9b04c172ec08e59cfc5cce3c441b90a80db0c057f3dfd63e83bd1f097158d3e1f2a8d6d05f2cb5479a15179e802b2b51b1ef8cde22fe

data/README.md

@@ -132,8 +132,8 @@ container_name 'myservice'
 You can add your own Docker Restart policy, see the [API documentation](https://docs.docker.com/reference/api/docker_remote_api_v1.15/#create-a-container)
 
 ```ruby
-restart_policy { "Name" => "always" }
-restart_policy { "Name" => "on-failure", "MaximumRetryCount" => 5 }
+restart_policy({ "Name" => "always" })
+restart_policy({ "Name" => "on-failure", "MaximumRetryCount" => 5 })
 ```
 
 #### Privileged containers

data/lib/armada/docker/container.rb

@@ -9,6 +9,10 @@ module Armada
       @name        = options[:container_name]
       @container   = docker_host.get_container(@name)
       @options     = options
+
+      now_in_ns = Integer(Time.now.to_f * 1000000.0)
+      @options[:binds] ||= []
+      @options[:binds] << "/var/log/#{@name}-#{now_in_ns}:/var/log/service"
     end
 
     def stop

data/spec/docker/container_spec.rb

@@ -28,6 +28,16 @@ describe Armada::Container do
     :host_config => { "StartConfigKey" => "StartConfigValue" },
   }}
 
+  describe "#initialize" do
+    before { armada_container }
+
+    it "should have the log mount" do
+      expect(options[:binds]).not_to be_nil
+      expect(options[:binds].length).to equal 1
+      expect(options[:binds][0]).to match /^\/var\/log\/#{container_name}-\d+:\/var\/log\/service$/
+    end
+  end
+
   describe "#stop" do
     context "when the container exists" do
       before { docker_host.should_receive(:get_container).and_return(docker_container) }
@@ -110,7 +120,7 @@ describe Armada::Container do
     it { should include("name"         => "some_container") }
     it { should include("ExposedPorts" => { "1111/tcp" => {}, "2222/udp" => {}}) }
     it { should include("Env"          => ["KEY=VALUE", "HOST=hostname"]) }
-    it { should include("Volumes"      => { "/container/log" => {}}) }
+    it { should include("Volumes"      => { "/container/log" => {} }) }
     it { should include("VolumesFrom"  => "parent") }
     it { should include("RestartPolicy" => { "MaximumRetryCount" => 5, "Name" => "always" }) }
     it { should include("CreateConfigKey" => "CreateConfigValue") }

metadata

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