dry-stack 0.0.85 → 0.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8f1e3847018ae24bd44d57813f7fb37afaa95e1a2697426eea8a40593dc07bd
-  data.tar.gz: 5c64bd98e446a32f0edc36e98b5ef48e8812dc29183786e30f70263865dee2c2
+  metadata.gz: ae624210dd275eb7f62eb30f4023ea37dfde7689e84b80e9f98bf4d47f5d66b4
+  data.tar.gz: '0109ac07fea18f6f942ad66d71292fd52da1f27cc0b99c2834d1620b6bdb2c67'
 SHA512:
-  metadata.gz: 06bf607c465894d9b640b04c9209cca967a7430958281ff45d61501f67705c715cd5afa6cf7d93532619b7f27947d1eb8b33e3ff217364e74bb888fad087460d
-  data.tar.gz: bf1de07565b2adf380ae0189ea6f257c052793372c542070425bf779e087e8dd6f9183082852e84d6b59fe2c67d40313a65cc351cc855671a5ce744b1bf6cdf7
+  metadata.gz: 07a69b0fc65be43c138f561eabff1a38525ceea703b43c368c292bbcd350bdff283f64b74f992aef6f7b0b97761af6ff7e594ee07b634900b1780ef559bae281
+  data.tar.gz: fc51afc785660c574d971374b300da2ba8ce67f9673b1d700822867ba7baefc89de0addba17c52e5b3da56c32bb2b2617233cf3337f3ee64ad5e925309f46b9f

data/lib/dry-stack/stack.rb

@@ -58,7 +58,6 @@ module Dry
     def logging(opts) = (@service[:logging] ||= {}).merge!  opts
     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
 
@@ -147,6 +146,8 @@ module Dry
 
       compose[:services].each do |name, service|
 
+        service[:image].gsub!(/:latest$/, '') # let docker swarm to create tag: :latest@sha265:0000...
+
         ingress = [@ingress[name], service[:ingress] || [] ].flatten.compact
 
         service[:deploy] ||= {}
@@ -173,14 +174,6 @@ 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))
-              service[:deploy][:labels] << "traefik.http.middlewares.#{service_name}-#{index}_auth.basicauth.users=#{ba_user}:#{hashed_password.gsub('$','$$')}"
-              service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.middlewares=#{service_name}-#{index}_auth"
-            end
-
             ing[:port] ||= service[:ports]&.first
             service[:deploy][:labels] += [
               "traefik.http.routers.#{service_name}-#{index}.service=#{service_name}-#{index}",
@@ -200,9 +193,18 @@ module Dry
 
             rule = []
             rule << "HostRegexp(`{name:#{nginx_host2regexp ing[:host]}}`)" if ing[:host]
+            rule << "ClientIP(#{[ing[:client_ip]].flatten.map{ "`#{_1}`" }.join ','})" if ing[:client_ip]
             rule << "PathPrefix(`#{nginx_host2regexp ing[:path]}`)" if ing[:path]
             rule << "#{ing[:rule]}" if ing[:rule]
 
+            if ing[:basic_auth]
+              ba_user, ba_password, salt = ing[:basic_auth].split ':'
+              hashed_password = apr1_crypt ba_password, (salt || rand(36**8).to_s(36))
+              service[:deploy][:labels] << "traefik.http.middlewares.#{service_name}-#{index}_auth.basicauth.users=#{ba_user}:#{hashed_password.gsub('$','$$')}"
+              service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.middlewares=#{service_name}-#{index}_auth"
+            end
+
+
             service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.rule=#{rule.join ' && '}"
 
             if ing[:path_sub]
@@ -214,7 +216,6 @@ module Dry
             end
           end
         end
-        service.delete :basic_auth
         service.delete :ingress
 
         service[:environment] = @environment[name].merge(service[:environment])  if @environment[name]
@@ -269,15 +270,18 @@ module Dry
       end
 
       compose[:configs].update(compose[:configs]) do |name, config|
+        # total config name must be max 64 characters length. MD5 - 32 characters
+        short_name = name[0..30]
+
         if config[:file_content]
           md5 = Digest::MD5.hexdigest config[:file_content]
-          fname = "./#{@name}.config.#{name}.#{md5}" # use MD5, when rn in parallel may have different content
+          fname = "./#{@name}.config.#{name}.#{md5}" # use MD5, when run in parallel may have different content
           File.write fname, config[:file_content]
-          {name: "#{name}-#{md5}", file: fname}.merge config.except(:file_content)
+          {name: "#{short_name}-#{md5}", file: fname}.merge config.except(:file_content)
         elsif config[:file]
           body = File.read config[:file] rescue ''
           md5 = Digest::MD5.hexdigest body
-          {name: "#{name}-#{md5}", file: fname}.merge config
+          {name: "#{short_name}-#{md5}", file: fname}.merge config
         else
           config
         end

data/lib/version.rb

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

metadata

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