capistrano-docker-deploy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56f35ee9a1bdd7cf01dfd894814c3d84e172ecc0242cdc3cc4d79d62f656689a
-  data.tar.gz: e527bef5a26b3f1e7074a0fc1a1894cf774aef25b0fbd267f772c6dad5dc4d2a
+  metadata.gz: 20a2b5e36d337a4b34180e9b037abd30e1d31ac7750cf43ebaa7efe92f81b307
+  data.tar.gz: ce6d985abbebede66c11699ea82d748d1f85a8118921aa0d6e00cfd630017106
 SHA512:
-  metadata.gz: 01ce97f5fc5b2f4e306bfe256b3b5d8246eb45e3b7b27b408d63e323fb8b67dfde54fb71363b83032a1314eee54b143947e949a6306d8a74a49984440c3b4860
-  data.tar.gz: a661d621f1896880b3e4a92cd1db2b6371d0b91f3ad93e97c333f53c8133edd89f2e4634263a567e0718229edeaf2fbcb640d15b9a9def75af372a4aeb514104
+  metadata.gz: 03e07527101daa5ecfd6bc1e4af63f4eb6b31152617298a21d02d796f48457c1fe074c3ffe7382b9a3bf608280f568188982439aaf5dbe8807cdbcc4a1b31a1e
+  data.tar.gz: adb9925ce2e4014978da3ddcc6e4fbbdfae131a38a7cdcdf387e7251885409fc4d6b87cf41373a031fb9a7860070ac27fd591b54b06110c4657214a1d9916422

data/lib/capistrano/docker/deploy/version.rb

@@ -3,7 +3,7 @@
 module Capistrano
   module Docker
     module Deploy
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
     end
   end
 end

data/lib/capistrano/tasks/docker/application.rake

@@ -8,8 +8,10 @@ namespace :docker do
           value = ENV.fetch(key) { nil }
           ['-e', "#{key}='#{value}'"] if value
         end.compact.flatten.join(' ')
-        fetch(:docker_network, nil) &&
-          network = "--network #{fetch(:docker_network)}"
+        network_list = [fetch(:docker_network, nil)].compact.flatten
+        networks = network_list.map do |network|
+          ['--network', network]
+        end.compact.flatten.join(' ')
         labels = fetch(:docker_labels).map do |label|
           ['--label', label]
         end.compact.flatten.join(' ')
@@ -18,7 +20,7 @@ namespace :docker do
                 '--name', fetch(:slug),
                 fetch(:docker_options, nil),
                 '-e', "RAILS_ENV=#{fetch(:stage)}", redact(env_vars),
-                '-e', "DATABASE_URL=#{fetch(:database_url)}", network, labels,
+                '-e', "DATABASE_URL=#{fetch(:database_url)}", networks, labels,
                 fetch(:exposed_ports).map { |pgp| ['-p', pgp] }.flatten
                                      .join(' '),
                 "#{fetch(:docker_registry_image)}:#{fetch(:docker_image_tag)}"

data/lib/capistrano/tasks/docker/database.rake

@@ -14,12 +14,14 @@ namespace :docker do
     desc 'Attempt to start the database container'
     task :start do
       on primary(:db) do
-        fetch(:docker_network, nil) &&
-          network = "--network #{fetch(:docker_network)}"
+        network_list = [fetch(:docker_network, nil)].compact.flatten
+        networks = network_list.map do |network|
+          ['--network', network]
+        end.compact.flatten.join(' ')
         execute 'docker', 'run', '-d', '--restart', 'always',
                 '--name', "#{fetch(:slug)}-db",
                 fetch(:docker_db_options, nil),
-                network, fetch(:database_image), '||', 'true'
+                networks, fetch(:database_image), '||', 'true'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-docker-deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tomislav Simnett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano