capistrano-docker 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e00664ef20e831381e0fb957d15120518c3771db
-  data.tar.gz: cfa1744cb9e3ed0cc02823fd5e98abad14f7ac9e
+  metadata.gz: 3aef6a89ccddfc0340a4db5dff49cebaaa0c2969
+  data.tar.gz: fd37f95c92987fec1fc992bc7aa1fd4fbec95285
 SHA512:
-  metadata.gz: c6af184ef2cfceea2f589fce53dc49c7fe12e0e7072615b864bc23e4c3c0066a891a280d641c7ce1f1a069bd3dfa32c20fb19f0e015e47768541f3a9ad59f992
-  data.tar.gz: 94c5f48f73147fe25715d15411e62eec4e927a6e3b80702ccde2f8828cd0fb7fef9b6e1829bda6c6c3707b4f8ab4cdf5359415c236f68a6d12e1a32d981f352f
+  metadata.gz: 9d64ad83e5952e180433b22b48cf98bad014b2e95ad3426ab39400e5fee055be5698815795975f0d05b3634a40800279e55eb68cf662e9720dedadaee9dfbbd4
+  data.tar.gz: 930a1c943c8204a1a5d8c6cdc812e14bc30787d9c1543d3089677b611ab4c5e45cfbf04268585cc4b8751678d14c085433ad09e417bb061a9f35d9cfbd38d8dd

data/capistrano-docker.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-docker'
-  spec.version       = '0.0.3'
+  spec.version       = '0.0.4'
   spec.authors       = ["Ross Riley"]
   spec.email         = ["riley.ross@gmail.com"]
   spec.description   = %q{Docker support for Capistrano 3.x}

data/lib/capistrano/tasks/deploy.rake

@@ -83,10 +83,11 @@ namespace :deploy do
         on roles :host do |host|
             config = ""
             fetch(:proxies).each do |proxy,port|
+                proxyport = capture "docker port #{fetch(:docker_appname)} "+port
                 config <<  "server {" + "\n"
                 config << "  server_name "+proxy+";" + "\n"
                 config << "  location / {" + "\n"
-                config << "    proxy_pass http://127.0.0.1:"+port+"/;" + "\n"
+                config << "    proxy_pass http://"+proxyport+"/;" + "\n"
                 config << "    proxy_set_header Host $http_host;" + "\n"
                 config << "  }" + "\n"
                 config << "}" + "\n"

data/lib/capistrano/tasks/docker.rake

@@ -21,14 +21,17 @@ namespace :docker do
 
     def build_run_command()
         cmd = "docker run "
-        fetch(:ports).each do |port,map|
-           cmd << "-p #{port}:#{map} "
+        fetch(:ports).each do |port|
+           cmd << "-p #{port} "
         end
         fetch(:volumes).each do |name,vol|
             execute "mkdir -p -m7777 #{fetch(:docker_mountpath)}/#{name}"
             cmd << "-v `pwd`/#{fetch(:docker_mountpath)}/#{name}:#{vol}:rw "
         end
-        cmd << "-name #{fetch(:docker_appname)} "
+        fetch(:links, {}).each do |link,name|
+            cmd << "--link "+link+":"+name+" "
+        end
+        cmd << "--name #{fetch(:docker_appname)} "
         cmd << "-e APP_USER='#{fetch(:app_username)}' "
         cmd << "-e APP_PASS='#{fetch(:app_password)}' "
         cmd << "-e APP_DB='#{fetch(:app_db)}' "

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-docker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ross Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano