dry-stack 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54ac4c65eb9a540d8b78351dc5bdc4510034618928f212532fa18a18db143ac2
-  data.tar.gz: cc6ccabf6a2a75b31236355012cfb033ce732f1b2379996aa519068ba95a51bd
+  metadata.gz: 1fdde5aef97bb0e9cd381fe8fb9191b7a4dcb3fcbb2a93daa8dc92dc09b7d8cd
+  data.tar.gz: d8205d27f505739e7dd7316170b98f2924c7cf700910ad5c5cf2e92376f68015
 SHA512:
-  metadata.gz: 4873a1ff78e0ff316448b84d33d2dee65c928069b30a575dc45af76635884ee77de33dd8aa6178aff29e21d05cbd2dc35c488d21c4cc92ff71830414771bc2b0
-  data.tar.gz: 8f85f6126686c34d6219dd8a21f50d8765d34fe1db4e9a4b6f753894d48bb5f0a609035dc9fd92b550d9df863b27948044ad081208d528435b9996c7977e1fdf
+  metadata.gz: '082bc6ed927bd5e5946c63faf531377fb3df998bafae31bd407a61256bf9a28166c78eb3b69a1e5988c6d1dec93405cc2c26a1feb6185f4d92b7261acad53748'
+  data.tar.gz: 7519e0d150a5dd434775ad88d249312d114c9229e3049c60d62f2cd8f9ba18f0889ad7929e6456bcf0851c207e80f37352f17cd36a1d0183d36eba72acc6b382

data/lib/dry-stack/stack.rb

@@ -147,16 +147,16 @@ module Dry
         configs: YAML.load(@configs.to_yaml, aliases: true)
       }
 
-      if @ingress.any?
-        compose[:networks].merge! ingress_routing: {external: true, name: 'ingress-routing'}
-      end
-
       compose[:services].each do |name, service|
 
         service[:image].gsub!(/:latest$/, '') if service[:image] # let docker swarm to create tag: :latest@sha265:0000...
 
         ingress = [@ingress[name], service[:ingress] || [] ].flatten.compact
 
+        if ingress.any?
+          compose[:networks].merge! ingress_routing: {external: true, name: 'ingress-routing'}
+        end
+
         service[:deploy] ||= {}
         service[:deploy][:labels] ||= []
         service[:deploy][:labels] += @labels.map { "#{_1}=#{_2}" }
@@ -231,13 +231,15 @@ module Dry
 
         service[:deploy].deep_merge! @deploy[name] if @deploy[name]
 
-        hash = {'service-name': service_name, 'stack-name': @name}
-        hash.default = ''
-        original_verbosity = $VERBOSE
-        $VERBOSE = nil
-        service[:deploy][:labels] = service[:deploy][:labels].map{ _1 % hash }
-        service[:environment].transform_values!{ _1.is_a?(String) ? (_1 % hash) : _1 }
-        $VERBOSE = original_verbosity
+        # hash = {'service-name': service_name, 'stack-name': @name}
+        env_sub = ->(s) {
+          s = s.to_s.dup
+          s.gsub!('%{stack-name}', @name.to_s)
+          s.gsub!('%{service-name}', service_name)
+          s
+        }
+        service[:deploy][:labels] = service[:deploy][:labels].map{ env_sub[_1] }
+        service[:environment].transform_values!{ _1.is_a?(String) ? (env_sub[_1]) : _1 }
 
         pp_i = @publish_ports[name]&.reject { _1.class == String }
         pp_s = @publish_ports[name]&.select { _1.class == String }

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.13'
+    VERSION = '0.1.15'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake