dry-stack 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b5476c2fbc526efb9f2626a6324ef08de62db257f415dad79117cd6ba9e2112
-  data.tar.gz: cbcd327643b6447815f1ca6c0119b0b4bedc2c07f382d7541be5f40372fed291
+  metadata.gz: b6b0981566e92e24a2da8878f387d0db385cf91c330bdbdf85cafd99f2c57561
+  data.tar.gz: f1a39d9413754ebe20c0249f9e7ea2c344c136387c0211ab9aa98c7fc37b4a24
 SHA512:
-  metadata.gz: 8b0cb4055dfc95cbd774ddacf53a4d7d3a3d8225e92c1aa97d7b317279db51f085ce700872c6bc34ab4b857c1102b4f3090460213ccbeb6fe85768d27b687fa0
-  data.tar.gz: cb635df42bf89ad2e08b33d2704348ac0091c087b36ec458d3f5aa0ceb5eda462339ee8b68fc7a17fde4464b1360b5f7ef94f1076d0531d041ff27e8557fd1e0
+  metadata.gz: b81863c9ebe1e517bdb3e3060e80673ea0ea870c307519c44ef0464bdd04f9aef5a0a18945973bc6d4fd97cb4dfe79822fa3d0511500366bcf05f7e360dbcad1
+  data.tar.gz: 3de0c4bd30868e4c82763d642e4b3904915ce3351dea066ae95b2933ee624aeded11bc4792afac46e8e6369797625c83ad15cf7be5d2bbcb9d1b8f20fb38b5ae

data/bin/stack2.drs

@@ -0,0 +1,8 @@
+PublishPorts reports: 7000
+Ingress reports: {host: 'reports.*', protocol: :http, port: 7000}
+
+Service :admin,     image: '$REGISTRY_HOST/frontend',  env: { APP: 'admin' },      ports: 5000
+Service :reports,   image: '$REGISTRY_HOST/reports', env: { DB_URL: '$DB_URL' }
+
+Network :default, attachable: true
+Network :ingress_routing, external: true, name: 'ingress-routing'

data/lib/dry-stack/stack.rb

@@ -31,6 +31,7 @@ module Dry
       @services = {}
       @networks = {}
       @publish_ports = {}
+      @ingress = {}
     end
 
     def stringify(hash) = hash.to_h { |k, v| [k.to_s, v.is_a?(Hash) ? stringify(v) : v] }
@@ -42,11 +43,18 @@ module Dry
       }
 
       compose[:services].each do |name, service|
-        service[:ports] = @publish_ports[name]&.zip(service[:ports])&.map { _1.join ':' }
-        service.delete_if { _2.nil? || _2.empty? }
+        @ingress[name][:port] ||= service[:ports]&.first if @ingress[name]
+        service[:deploy] ||= {}
+        service[:deploy][:labels] = @ingress[name]&.map { |k, v| "ingress.#{k}=#{v}" }
+
+        service[:ports] = @publish_ports[name]&.zip(service[:ports] || @publish_ports[name])&.map { _1.join ':' }
       end
 
-      compose.delete_if { _2.nil? || _2.empty? }
+      prune = ->(o) {
+        o.each { prune[_2] }  if o.is_a? Hash
+        o.delete_if { _2.nil? || (_2.respond_to?(:empty?) && _2.empty?) } if o.is_a? Hash
+      }
+      prune[compose]
       stringify(compose).to_yaml
     end
 
@@ -67,6 +75,10 @@ module Dry
       ServiceFunction.new(@services[name], &)  if block_given?
     end
 
+    def Ingress(services)
+      @ingress.merge! services
+    end
+
     def Network(name, opts = {})
       @networks[name] ||= {}
       @networks[name].merge! opts

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -104,6 +104,7 @@ files:
 - bin/dry-stack
 - bin/stack.drs
 - bin/stack1.drs
+- bin/stack2.drs
 - lib/dry-stack.rb
 - lib/dry-stack/command_compose.rb
 - lib/dry-stack/command_line.rb