dry-stack 0.0.83 → 0.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 699b765bc2706a898f06c1ba3409d93723584e567865f9b21800a2f800700dad
-  data.tar.gz: 3a2ed784ad03723d09a19686a8f0204987a15876676e117596bbc5b24fa78419
+  metadata.gz: f8f1e3847018ae24bd44d57813f7fb37afaa95e1a2697426eea8a40593dc07bd
+  data.tar.gz: 5c64bd98e446a32f0edc36e98b5ef48e8812dc29183786e30f70263865dee2c2
 SHA512:
-  metadata.gz: 3f98d9d33f3cdc6616e484f62ba41026c1e88cdbb7d19095087412ba3bb788d5841d166f2a3a4874561eaf0a0c13303609a6abeef479d8852d855bb694162d76
-  data.tar.gz: 3fbd781699888422c806330c0bf3036e16a78017911bff5d46383b07834d7b6560d4b02073ce29c6813b4c841acf7689cd00dba89fdf555dd00f97ece7b26629
+  metadata.gz: 06bf607c465894d9b640b04c9209cca967a7430958281ff45d61501f67705c715cd5afa6cf7d93532619b7f27947d1eb8b33e3ff217364e74bb888fad087460d
+  data.tar.gz: bf1de07565b2adf380ae0189ea6f257c052793372c542070425bf779e087e8dd6f9183082852e84d6b59fe2c67d40313a65cc351cc855671a5ce744b1bf6cdf7

data/lib/dry-stack/stack.rb

@@ -47,6 +47,7 @@ module Dry
   class ServiceFunction
     def initialize(service, &); @service = service; instance_exec(&) end
     def env(variables)= @service[:environment].merge! variables
+    def dns(dns)= ((@service[:dns] ||= []) << dns).flatten!
     def volume(opts)= ((@service[:volumes] ||= []) << opts).flatten!
     def image(name)= @service[:image] = name
     def ports(ports)= ((@service[:ports] ||= []) << ports).flatten!
@@ -58,6 +59,7 @@ module Dry
     def user(user) = @service[:user] = user #  "${UID}:${GID}", "www-data:www-data"
     def network(names) = (@service[:networks] ||= []) << names
     def basic_auth(user_and_password) = @service[:basic_auth] = user_and_password
+    def ingress(ing) = ((@service[:ingress] ||=[]) << ing).flatten!
   end
 
   class SwarmFunction
@@ -144,7 +146,9 @@ module Dry
       end
 
       compose[:services].each do |name, service|
-        ingress = [@ingress[name]].flatten.compact
+
+        ingress = [@ingress[name], service[:ingress] || [] ].flatten.compact
+
         service[:deploy] ||= {}
         service[:deploy][:labels] ||= []
         service[:deploy][:labels] += @labels.map { "#{_1}=#{_2}" }
@@ -169,6 +173,7 @@ module Dry
           ingress[0][:port] ||= service[:ports]&.first
 
           ingress.each_with_index do |ing, index|
+
             if service[:basic_auth]
               ba_user, ba_password, salt = service[:basic_auth].split ':'
               hashed_password = apr1_crypt ba_password, (salt || rand(36**8).to_s(36))
@@ -210,6 +215,7 @@ module Dry
           end
         end
         service.delete :basic_auth
+        service.delete :ingress
 
         service[:environment] = @environment[name].merge(service[:environment])  if @environment[name]
         service[:environment].merge! STACK_NAME: @name.to_s, STACK_SERVICE_NAME: name.to_s

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.83'
+    VERSION = '0.0.85'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.83
+  version: 0.0.85
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake