capistrano-docker_cluster 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b21dd5be728c678022ef6ae1b2bc6034e8610cac1c2152fd3cde26e852e0bc35
-  data.tar.gz: 4a297e06578a06670daab133c6dca12c19d3b2596a82d9f26605d1391adade49
+  metadata.gz: b8968081d032261ad943dd8c0a356c9b9862ebd6b000b54e5489fe4f934c401f
+  data.tar.gz: 727e4cef7ef2ab53e3ca6c6a19f820b938135f5a024193a83d30bdc217b1826a
 SHA512:
-  metadata.gz: 5fc892bf4d56e78fabec0603b8e03ae1edbf151d54753fc46abc71d2a5d0272fd46b5612da053c2e6925a7d7e560fa99d024aea4f26bc57c8456236cd38728c1
-  data.tar.gz: 5f903a514ea9366f8f4d502b0b32c2cbe821be92edd8344e9d74519cd19346f09c8a348de8723045bd429b1e5c2106ccfe2b3507cf4f5b5cd3d5c2787d78ff58
+  metadata.gz: 66820769e19bea0782c7e5c0f966593f8a4a3472bead40666ea0167f2ad91c9e51760fa15b9477a8c8b0d191ef637a6961c44fab42a0c7cdfd0284030a1dc9f8
+  data.tar.gz: 3cbb64c824c58e5512cf5481981692e0d9363c3e38e14fe55e836a51bafc86f2f4fe9c55803f6ef59fd796411438b166f0583784f704601f5a353d48f6eb8256

data/CHANGE_LOG.md

@@ -1,3 +1,7 @@
+# 1.0.2
+
+* Allow specifying app specific settings as capistrano variables `docker_app_configs_<app>` and `docker_app_args_<app>`.
+
 # 1.0.1
 
 * Fix module naming convention to match gem name.

data/README.md

@@ -32,10 +32,16 @@ The deployment is configured with the following properties in your capistrano re
 
 * `docker_app_configs` - Map of configuration files for starting specific docker apps.
 
+* `docker_configs_<app>` - List of global configuration files for starting a docker app.
+
 * `docker_args` - List of global command line arguments for all continers.
 
 * `docker_app_args` - Map of command line arguments for starting specific docker apps.
 
+* `docker_args_<app>` - List of global command line arguments for starting a specific docker app.
+
+Directory structures are ignored when configuration filse copies to servers for `docker_configs` and `docker_app_configs`. This means you can only have one file with a given base name in all you configuration files. So, `config/app/web.properties` and `config/production/web.properties` will both be copied to `confg/web.properties` on the servers. You can use this feature to overwrite whole files if you need to, but otherwise you'll need to use unique file names.
+
 ### Example Configuration
 
 ```ruby

data/bin/docker-cluster

@@ -20,7 +20,7 @@
 # host port 8000 to container port 80 and the second mapping host port 8001 to container port 80.
 #
 # The --hostname parameter can be used to specify a base host name for the containers. The host name for each
-# container will be "container_name.base_host_hamer" where container name uses a hyphen instead of a period as
+# container will be "container_name.base_host_name" where container name uses a hyphen instead of a period as
 # the delimiter.
 #
 # The --healthcheck parameter can be used to specify either a command to run inside the container or a URL
@@ -38,6 +38,8 @@
 #
 # The --command parameter can be used to specify the command each docker container should run. If multiple command parameters
 # are specified, they will be concatenated together. You can use this to specify a command and arguments separately.
+# You can also specify the command by using --. Anything after a double hyphen will be appended to the docker
+# command line verbatim.
 #
 # The --force parameter can be used to specify that containers should always be restarted. The default behavior
 # is to only restart containers if they are not running the specified image.
@@ -139,6 +141,11 @@ read_arguments() {
         set -o xtrace
         CMD_OUT=/dev/stdout
         ;;
+      -- )
+        shift
+        DOCKER_RUN_COMMAND="$DOCKER_RUN_COMMAND $@"
+        shift ${#@}
+        ;;
       * )
         DOCKER_RUN_ARGS="$DOCKER_RUN_ARGS $1"
     esac

data/lib/capistrano-docker_cluster.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "capistrano/docker_cluster"

data/lib/capistrano/docker_cluster/scripts.rb

@@ -130,10 +130,22 @@ module Capistrano
         end
 
         apps = Array(fetch_for_host(host, :docker_apps))
-
         app_configs = app_configuration(fetch(:docker_app_configs, nil))
+        host_app_configs = app_configuration(host.properties.send(:docker_app_configs))
+        apps += app_configs.keys if app_configs
+        apps += host_app_configs.keys if host_app_configs
+        apps = apps.collect(&:to_s).uniq
+
+        if app_configs
+          app_configs.values.each do |paths|
+            Array(paths).each do |path|
+              configs[File.basename(path)] = path
+            end
+          end
+        end
+
         apps.each do |app|
-          Array(app_configs[app.to_s]).each do |path|
+          Array(fetch(:"docker_app_configs_#{app}")).each do |path|
             configs[File.basename(path)] = path
           end
         end
@@ -142,9 +154,16 @@ module Capistrano
           configs[File.basename(path)] = path
         end
 
-        host_app_configs = app_configuration(host.properties.send(:docker_app_configs))
+        if host_app_configs
+          host_app_configs.values.each do |paths|
+            Array(paths).each do |path|
+              configs[File.basename(path)] = path
+            end
+          end
+        end
+
         apps.each do |app|
-          Array(host_app_configs[app.to_s]).each do |path|
+          Array(host.properties.send(:"docker_app_configs_#{app}")).each do |path|
             configs[File.basename(path)] = path
           end
         end
@@ -182,24 +201,43 @@ module Capistrano
       end
 
       def app_host_args(app, host)
-        config_args = config_args(fetch(:docker_configs, nil))
+        global_config_args = config_args(fetch(:docker_configs, nil))
         command_args = Array(fetch(:docker_args, nil))
 
         host_config_args = config_args(host.properties.send(:docker_configs))
-        host_command_args = Array(host.properties.send(:"docker_args"))
+        host_command_args = Array(host.properties.send(:docker_args))
 
         app_configs = app_configuration(fetch(:docker_app_configs, {}))
         app_args = app_configuration(fetch(:docker_app_args, {}))
 
-        host_app_configs = app_configuration(host.properties.send(:"docker_app_configs"))
-        host_app_args = app_configuration(host.properties.send(:"docker_app_args"))
+        host_app_configs = app_configuration(host.properties.send(:docker_app_configs))
+        host_app_args = app_configuration(host.properties.send(:docker_app_args))
 
         app = app.to_s
         app_config_args = config_args(app_configs[app])
         app_command_args = Array(app_args[app])
         host_app_config_args = config_args(host_app_configs[app])
         host_app_command_args = Array(host_app_args[app])
-        args = config_args + command_args + app_config_args + app_command_args + host_config_args + host_command_args + host_app_config_args + host_app_command_args
+
+        inline_app_config_args = config_args(fetch(:"docker_app_configs_#{app}", nil))
+        inline_app_command_args = Array(fetch(:"docker_app_args_#{app}", nil))
+
+        host_inline_app_config_args = config_args(host.properties.send(:"docker_app_configs_#{app}"))
+        host_inline_app_command_args = Array(host.properties.send(:"docker_app_args_#{app}"))
+
+        args = global_config_args +
+               command_args +
+               app_config_args +
+               inline_app_config_args +
+               app_command_args +
+               inline_app_command_args +
+               host_config_args +
+               host_command_args +
+               host_app_config_args +
+               host_inline_app_config_args +
+               host_app_command_args +
+               host_inline_app_command_args
+
         args.uniq
       end
     end

data/lib/capistrano/docker_cluster/version.rb

@@ -2,6 +2,6 @@
 
 module Capistrano
   module DockerCluster
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-docker_cluster
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brian Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-28 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -65,6 +65,7 @@ files:
 - README.md
 - bin/docker-cluster
 - capistrano-docker_cluster.gemspec
+- lib/capistrano-docker_cluster.rb
 - lib/capistrano/docker_cluster.rb
 - lib/capistrano/docker_cluster/scripts.rb
 - lib/capistrano/docker_cluster/version.rb