capdocker 1.0.29 → 1.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4ef0b222e94439befb2411332460afb9ae3680
-  data.tar.gz: 1d46d88d3d37245b73a4c5b8d563a84f821e57a4
+  metadata.gz: 496da00d697f645181e991429e3b27fbdfa9ecc1
+  data.tar.gz: 785a9f82e61e255a1bcee767b765dfd3f26fb41f
 SHA512:
-  metadata.gz: e72ae05d532c2754cecec4d3566e047b46a8700ccfb3333f09906abc0035fe8275650bc65c2f025dfe50e9bef84d80c60197b67369c8f723cb9d5a745b047620
-  data.tar.gz: 5e6ca1528c82136e08eb7f7af021c6f2ebb44aaf399603f19d53c9ac57cb2b0a77f87aed8839a9d661c01303ebb28ec456717fc9091b3f929ca4cfb5c18228a9
+  metadata.gz: 34d7c65e7ac6efdfe0e05c07e6b261be35024f2213dc81d761cdbeef8de4dc3000d4b6d18bbdc17bb8846fe2969230ec4b217568bcba04df2104fbcfe32234de
+  data.tar.gz: 7d64f3275146e402d9d8c07ac2c1038da5a14779954c9ace30dc1b082e7479b1f0111278a2c7748a08326ea06fd9d02f21da585a9fa07d17f161ae1b9843c944

data/capdocker.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capdocker}
-  s.version = "1.0.29"
+  s.version = "1.0.30"
   s.authors = ["Ross Riley", "One Black Bear"]
   s.email = %q{ross@oneblackbear.com}
   s.date = Time.now

data/lib/docker.rb

@@ -5,7 +5,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 		desc "build an updated box, restart container"
 	  task :build do
 	    run "docker build -t oneblackbear/#{application} containers/#{application}/"
-	    run "docker ps | grep #{app_port} | awk '{print $1}' | xargs -n 1 docker kill"
+	    run "docker kill #{application}"
 	    run build_run_command
 	  	puts "*** Application #{application} now deloyed to port #{app_port} ***"
 	  end

data/lib/docker_deploy.rb

@@ -10,6 +10,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   set   :user,            "docker"
   set   :app_domain,      "docker.oneblackbear.com"
   set   :app_port,        random_app_number+8100
+  set   :branch,          "HEAD"
   if roles.empty? 
     role :web, "obb1.oneblackbear.com"
   end
@@ -72,8 +73,8 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     task :update_code do
       puts "Pushing code for current git commit ..."
-      set :tag, %x[git rev-parse --short HEAD].strip() + ".tar.gz"
-      run_locally "git archive HEAD | gzip > #{tag}"
+      set :tag, %x[git rev-parse --short #{branch}].strip() + ".tar.gz"
+      run_locally "git archive #{branch} | gzip > #{tag}"
       upload "#{tag}", "containers/#{application}", :via => :scp, :mkdir => true
       run_locally "rm #{tag}"
       run "cd containers/#{application} && tar -xzvf #{tag}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capdocker
 version: !ruby/object:Gem::Version
-  version: 1.0.29
+  version: 1.0.30
 platform: ruby
 authors:
 - Ross Riley