docker-armada 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a2f5310391f2084d5d296b0b548998ec13af230
-  data.tar.gz: f44750dbb09b63886daeb448fe839e77ba1b9261
+  metadata.gz: 94c071928f455d69d8bd5ea46f533df159dd8686
+  data.tar.gz: 2111c88ab451971eb5cb41fb1724369f35a5af6e
 SHA512:
-  metadata.gz: 16d255a647af783034fa5723711d94f0465b80b3e0fe0c8e6de6cce4eb480473a0c3649c7a9c4c91b60316e341b264109edcbbd633a19653708a1ced0219ac5a
-  data.tar.gz: 5cf9fee2ca6bcce102ed9b04c172ec08e59cfc5cce3c441b90a80db0c057f3dfd63e83bd1f097158d3e1f2a8d6d05f2cb5479a15179e802b2b51b1ef8cde22fe
+  metadata.gz: f23d9f96684152737244dd7d027104980cd751a86c48dd55b140b59252b35bc31a52993113f8b5e40917de8bdf96f942ee8fddb242ea3ebc21d4177897da9a47
+  data.tar.gz: 6acc45b91eb2da738d37cd614944bd6c914a5c228899f6e949a9209cdf95cdf7c745b0965ef57048d4026eb687d829952976be7cffc9fb7c2d84900e58e97d82

data/lib/armada/cli.rb

@@ -36,10 +36,11 @@ module Armada
     subcommand "clean", Armada::CleanCli
 
     desc "stop <project> <environment>", "Stop running containers for the project in the environment. Use --force to actually stop the containers"
+    option :force,            :type => :boolean, :aliases => :f, :desc => "Must specify the force option if you want the containers stopped", :default => false, :lazy_default => true
     option :hosts,            :type => :array,   :aliases => :h, :desc => "The docker host(s) to deploy to. This can be a comma sepearted list."
     option :ssh_gateway,      :type => :string,  :aliases => :G, :desc => "SSH Gateway Host"
     option :ssh_gateway_user, :type => :string,  :aliases => :U, :desc => "SSH Gateway User"
-    option :force,            :type => :boolean, :aliases => :f, :desc => "Must specify the force option if you want the containers stopped", :default => false, :lazy_default => true
+    option :volumes,          :type => :boolean, :aliases => :v, :desc => "Remove the volumes associated with the container", :default => false, :lazy_default => true
     def stop(project, environment)
       Armada::Commands.stop(project, environment, options)
     end

data/lib/armada/docker/container.rb

@@ -12,7 +12,7 @@ module Armada
 
       now_in_ns = Integer(Time.now.to_f * 1000000.0)
       @options[:binds] ||= []
-      @options[:binds] << "/var/log/#{@name}-#{now_in_ns}:/var/log/service"
+      @options[:binds] << "/var/log/containers/#{@name}/#{SecureRandom.uuid}:/var/log/service"
     end
 
     def stop
@@ -45,7 +45,7 @@ module Armada
     def kill
       return if @container.nil?
       info "Stopping old container #{@container.id[0..7]} (#{@name})"
-      @container.kill
+      @container.kill :v => @options[:volumes]
     end
 
     def remove

data/spec/docker/container_spec.rb

@@ -34,7 +34,7 @@ describe Armada::Container do
     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$/
+      expect(options[:binds][0]).to match /^\/var\/log\/containers\/#{container_name}\/.*:\/var\/log\/service$/
     end
   end
 

metadata

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