dry-stack 0.0.39 → 0.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50bc59b593a8772c5e17d4c9d6b3f3d3e9417ad75ed38c3e29242ae5993fb5df
-  data.tar.gz: 9b300abb3d36ef7ec3288e881f203afe5c8538b3c5911fb7d4211f46f90da3a2
+  metadata.gz: ba3e8a1af6b73dab3938541b4e57ff3b4cd8a9cc745ce3a0376c218189b637c0
+  data.tar.gz: c99d06063a7c31100aa58b7a8b1dc1bbabf5543aa45da1ed4e50a5b9d16c33ff
 SHA512:
-  metadata.gz: 45b33ebc74270d9b17fbf5f5a3b4cde1118ebd753fa7fb75d103ec8d57689265b089df309aa42048fda9bbd37eed34f598d1bcc267e7e6388bb04e7997f757bc
-  data.tar.gz: 836eb9f3f9f3b399910009c6ce30c2cde5d4663f6faf7cb827c2360821f7321ad6c90c3bcede99b9bf1ca0b4074fa620a37bcd435e148ca0bab7be08ebfab4bf
+  metadata.gz: 465baf756681438604e591107265a16b5f456ba8c92adfeec256d32abc8e8d162a23c658c0be1449b9b2b2f1f42f7d2f8603cdbc15ce6911a46c61afa63ae6ed
+  data.tar.gz: 3b20f234381bf01bbcd95f7e65762473439074fee9665bc34443dff4b7e71d1c7df960187436070e18f02c6bccd84ee7c744ccc4f868ce4407a29a350dc01186

data/lib/dry-stack/stack.rb

@@ -93,7 +93,6 @@ module Dry
 
       compose[:services].each do |name, service|
         ingress = [@ingress[name]].flatten
-        ingress[0][:port] ||= service[:ports]&.first if ingress[0]
         service[:deploy] ||= {}
         service[:deploy][:labels] ||= []
         service[:deploy][:labels] += @labels.map { "#{_1}=#{_2}" }
@@ -112,38 +111,40 @@ module Dry
         end
 
         if ingress[0] && opts[:ingress]
+          ingress[0][:port] ||= service[:ports]&.first
           service[:deploy][:labels] = ingress[0]&.map { |k, v| "ingress.#{k}=#{v}" }
         end
 
         service_name = "#{@name}_#{name}"
 
         if ingress[0] && (opts[:traefik] || opts[:traefik_tls])
-          service[:deploy][:labels] += [
-            'traefik.enable=true',
-            "traefik.http.routers.#{service_name}.service=#{service_name}",
-            "traefik.http.services.#{service_name}.loadbalancer.server.port=#{ingress[0][:port]}"
-          ]
-
-          if opts[:traefik_tls]
-            domain = opts[:tls_domain] || 'example.com'
-            domain = @ingress[name][:host].gsub('.*', ".#{domain}") if @ingress[name][:host]
-            domain = @ingress[name][:tls_domain] if @ingress[name][:tls_domain]
+          service[:deploy][:labels] << 'traefik.enable=true'
+
+          ingress.each_with_index do |ing, index|
+            ing[:port] ||= service[:ports]&.first
             service[:deploy][:labels] += [
-              "traefik.http.routers.#{service_name}.tls=true",
-              "traefik.http.routers.#{service_name}.tls.certresolver=le",
-              "traefik.http.routers.#{service_name}.tls.domains[0].main=#{domain}"
+              "traefik.http.routers.#{service_name}-#{index}.service=#{service_name}-#{index}",
+              "traefik.http.services.#{service_name}-#{index}.loadbalancer.server.port=#{ing[:port]}"
             ]
-          end
 
-          rule_group = ingress.map do|r|
+            if opts[:traefik_tls]
+              domain = opts[:tls_domain] || 'example.com'
+              domain = @ingress[name][:host].gsub('.*', ".#{domain}") if @ingress[name][:host]
+              domain = @ingress[name][:tls_domain] if @ingress[name][:tls_domain]
+              service[:deploy][:labels] += [
+                "traefik.http.routers.#{service_name}-#{index}.tls=true",
+                "traefik.http.routers.#{service_name}-#{index}.tls.certresolver=le",
+                "traefik.http.routers.#{service_name}-#{index}.tls.domains[0].main=#{domain}"
+              ]
+            end
+
             rule = []
-            rule << "HostRegexp(`{name:#{nginx_host2regexp r[:host]}}`)" if r[:host]
-            rule << "PathPrefix(`#{nginx_host2regexp r[:path]}`)" if r[:path]
-            rule << "#{r[:rule]}" if r[:rule]
-            rule.join ' && '
+            rule << "HostRegexp(`{name:#{nginx_host2regexp ing[:host]}}`)" if ing[:host]
+            rule << "PathPrefix(`#{nginx_host2regexp ing[:path]}`)" if ing[:path]
+            rule << "#{ing[:rule]}" if ing[:rule]
+
+            service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.rule=#{rule.join ' && '}"
           end
-          rule = rule_group.size > 1 ? rule_group.map{"(#{_1})"}.join(' || ') : rule_group[0]
-          service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=#{rule}"
         end
 
         hash = {'service-name': service_name}

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.39'
+    VERSION = '0.0.41'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.41
 platform: ruby
 authors:
 - Artyom B