dry-stack 0.0.17 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e144f42147da952c0e65601dae18a2acc24918481efb5e663b50bcac10e3e412
-  data.tar.gz: 177ceb9ac90bc47533dba089def9cfa0e942a9e3ab9571f1fef9a95d8a46f804
+  metadata.gz: 2dced663093a984ba6f7fb3d351e7bf0978facfab7636ca6b91f42b3b43f3247
+  data.tar.gz: 686c2a7e3d92a941fdfce24a4c715192fa6e02299d83cf4f8bc19602d27eee57
 SHA512:
-  metadata.gz: 409852566e39b2e0c29ccfe89aaf99b4b2a9837825808f278bf8c775f31e1750ed37a923be948a2a51060807c799d3de32fb867a889428fd365e5ed7ba22cfee
-  data.tar.gz: 0fe630b87412fde207f98c6196631db42d66a7b5e4b95dd5a85f8b83d0e8ae89e055df66974f37c67726d58af2788a412f41b68992f8ebbfd45937af023b3d6a
+  metadata.gz: f003221445e7a8b249a5e9caced8fe2f813d3ea0ac0d72183edd3cfc58cc4ac02e2c798dc63cd10e0b680063fbff221b73a71e97da65c92108f1588760bf8c18
+  data.tar.gz: f8cec9c28d6b0ae5b534c8e30db18a2cc5ad5e3587e5529fc271fff9bc67642b822dc2db865309249e960e2bc7848473f3b75fce1d44f5ef1ca9628d3f1768fe

data/bin/dry-stack

@@ -6,6 +6,7 @@ $LOAD_PATH << lib
 require 'dry-stack'
 require 'dry-stack/command_line'
 require 'dry-stack/command_compose'
+require 'dry-stack/command_swarm_deploy'
 include Dry
 
 Dry::CommandLine.run ARGV

data/lib/dry-stack/command_line.rb

@@ -42,6 +42,7 @@ module Dry
           o.on('',   '--ingress', 'Generate ingress labels') { true }
           o.on('',   '--traefik', 'Generate traefik labels') { true }
           o.on('',   '--traefik_tls', 'Generate traefik tls labels') { true }
+          o.on('',   '--host_sed /from/to/', 'Sed ingress host  /\\*/dev.*/')
           o.on('-n', '--no-env', 'Do not process env variables') { true }
           o.on('-h', '--help') { puts o; exit }
           o.parse! args, into: params

data/lib/dry-stack/command_swarm_deploy.rb

@@ -0,0 +1,17 @@
+require_relative 'command_line'
+
+Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
+  def run(stack, params)
+    _params = stack.options.merge params
+    yaml = stack.to_compose(_params).lines[1..].join
+
+    # substitute ENV variables
+    yaml = _params[:'no-env'] ? yaml : `echo \"#{yaml.gsub("`", '\\\`')}\"`
+    system " echo \"#{yaml}\" "
+    system " echo \"#{yaml}\" | docker stack deploy -c - #{stack.name} --prune --resolve-image changed"
+  end
+
+  def help = 'Call docker stack deploy'
+end.new
+
+

data/lib/dry-stack/stack.rb

@@ -75,40 +75,46 @@ module Dry
         service[:deploy] ||= {}
         service[:deploy][:labels] ||= []
 
-        if @ingress[name] && (opts[:ingress] || opts[:traefik])
+        if @ingress[name] && (opts[:ingress] || opts[:traefik] || opts[:traefik_tls])
           service[:networks] ||= []
           service[:networks] << 'default' if service[:networks].empty?
           service[:networks] << 'ingress_routing'
         end
 
+        if opts[:host_sed] && @ingress.dig(name,:host)
+          a, b = opts[:host_sed].split('/').reject(&:empty?)
+          @ingress[name][:host].gsub! %r{#{a}}, b
+        end
+
         if @ingress[name] && opts[:ingress]
           service[:deploy][:labels] = @ingress[name]&.map { |k, v| "ingress.#{k}=#{v}" }
         end
 
-        if @ingress[name] && opts[:traefik]
+        if @ingress[name] && (opts[:traefik] || opts[:traefik_tls])
           service_name = "#{@name}_#{name}"
-          service[:deploy][:labels] += [
-            'traefik.enable=true',
-            "traefik.http.routers.#{service_name}.service=#{service_name}",
-            "traefik.http.services.#{service_name}.loadbalancer.server.port=#{@ingress[name][:port]}",
-            "traefik.http.routers.#{service_name}.rule=HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)"
-          ]
-        end
 
-        if @ingress[name] && opts[:traefik_tls]
-          service_name = "#{@name}_#{name}"
           service[:deploy][:labels] += [
             'traefik.enable=true',
             "traefik.http.routers.#{service_name}.service=#{service_name}",
             "traefik.http.services.#{service_name}.loadbalancer.server.port=#{@ingress[name][:port]}",
-            "traefik.http.routers.#{service_name}.rule=HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)",
-            "traefik.http.routers.#{service_name}.entrypoints=http",
-            "traefik.http.routers.#{service_name}.middlewares=service_stack-https-redirect",
-            "traefik.http.routers.#{service_name}.rule=Host(`${REGISTRY_HOSTNAME}`)",
-            "traefik.http.routers.#{service_name}.entrypoints=https",
-            "traefik.http.routers.#{service_name}.tls=true",
-            "traefik.http.routers.#{service_name}.tls.certresolver=le"
           ]
+
+          if opts[:traefik_tls]
+            service[:deploy][:labels] += [
+              "traefik.http.routers.#{service_name}.entrypoints=http",
+              "traefik.http.routers.#{service_name}.middlewares=service_stack-https-redirect",
+              "traefik.http.routers.#{service_name}.entrypoints=https",
+              "traefik.http.routers.#{service_name}.tls=true",
+              "traefik.http.routers.#{service_name}.tls.certresolver=le"
+            ]
+          end
+
+          if @ingress[name][:host]
+            service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)"
+          end
+          if @ingress[name][:rule]
+            service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=#{@ingress[name][:rule]}"
+          end
         end
 
         service[:deploy].merge! @deploy[name] if @deploy[name]

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.17'
+    VERSION = '0.0.19'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.19
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,7 @@ files:
 - lib/dry-stack.rb
 - lib/dry-stack/command_compose.rb
 - lib/dry-stack/command_line.rb
+- lib/dry-stack/command_swarm_deploy.rb
 - lib/dry-stack/stack.rb
 - lib/version.rb
 homepage: https://rubygems.org/gems/dry-stack