dry-stack 0.0.60 → 0.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15007db0e8720d467e40e7251fbf35aa4fd505f767cdf0b4883ba9b6d5a53eb
-  data.tar.gz: cfcde2ffaa68e445c2bb5aeefc37453c84d284d675cd68f05a41a4e64c87cade
+  metadata.gz: caffb5646e1efee1f02cf078eb744401defe94ebc1b8e7154879ee579e4c8dcd
+  data.tar.gz: c713cebe8ee2955242360f525b109a34024e1398219d4741e12d1fb677dd07fc
 SHA512:
-  metadata.gz: 96312828ace2b79bee3e73e8f7015c74d3259786ab556b2e85779ef9a6b087fbbf3f966c65798aac457932cb6cc2dad69f4631463a64b7f94d2ccf96ac7366e1
-  data.tar.gz: d1cc5c3e5c70cbcd7e19d6728eaa21ee976e029c95d6804356896127612588fdd2fc91c2cf04dad9174c017ac6dbeb1bacf29b0d66c100a462f4cf5284390eae
+  metadata.gz: ec07d745f09095675c8aabfa0207a0ebe138d1669691b127744d4e4f5361ef9fd7edc52bf509fcc32a717c04f16d7351f6775d2be5d4116d6fb488a7b5a9d597
+  data.tar.gz: 8430a282d7bd5e9853bd1f53238a43149b69bf6679c8b4ad660be2c4e54c8c279995b2e763fbed5bcfda3f44ba084ff31da0a1a28118ac77bbbc08b0a6c21e67

data/lib/dry-stack/stack.rb

@@ -141,8 +141,8 @@ module Dry
 
             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]
+              domain = ing[:host].gsub('.*', ".#{domain}") if ing[:host]
+              domain = ing[:tls_domain] if ing[:tls_domain]
               service[:deploy][:labels] += [
                 "traefik.http.routers.#{service_name}-#{index}.tls=true",
                 "traefik.http.routers.#{service_name}-#{index}.tls.certresolver=le",
@@ -156,14 +156,27 @@ module Dry
             rule << "#{ing[:rule]}" if ing[:rule]
 
             service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.rule=#{rule.join ' && '}"
+
+            if ing[:path_sub]
+              service[:deploy][:labels] += [
+                "traefik.http.routers.#{service_name}-#{index}.middlewares=#{service_name}-#{index}-path_sub",
+                "traefik.http.middlewares.#{service_name}-#{index}-path_sub.replacepathregex.regex=#{ing[:path_sub][0]}",
+                "traefik.http.middlewares.#{service_name}-#{index}-path_sub.replacepathregex.replacement=#{ing[:path_sub][1].gsub('$','$$')}"
+              ]
+            end
           end
         end
 
-        hash = {'service-name': service_name}
+        service[:environment] = @environment[name].merge(service[:environment])  if @environment[name]
+        service[:environment].merge! STACK_NAME: @name.to_s, STACK_SERVICE_NAME: name.to_s
+        service[:environment].transform_values! { !!_1 == _1 ? _1.to_s : _1 } # (false|true) to string
+
+        hash = {'service-name': service_name, 'stack-name': @name}
         hash.default = ''
         original_verbosity = $VERBOSE
         $VERBOSE = nil
         service[:deploy][:labels].map!{ _1 % hash }
+        service[:environment].transform_values!{ _1.is_a?(String) ? (_1 % hash) : _1 }
         $VERBOSE = original_verbosity
 
         service[:deploy].merge! @deploy[name] if @deploy[name]
@@ -173,10 +186,6 @@ module Dry
         service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }
         service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
 
-        service[:environment] = @environment[name].merge(service[:environment])  if @environment[name]
-        service[:environment].merge! STACK_NAME: @name, STACK_SERVICE_NAME: name
-
-        service[:environment].transform_values! { !!_1 == _1 ? _1.to_s : _1 } # (false|true) to string
         service[:logging] ||= @logging[name.to_sym]
 
         service[:configs]&.each do |config|

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.60'
+    VERSION = '0.0.62'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.62
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake