dry-stack 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b5476c2fbc526efb9f2626a6324ef08de62db257f415dad79117cd6ba9e2112
-  data.tar.gz: cbcd327643b6447815f1ca6c0119b0b4bedc2c07f382d7541be5f40372fed291
+  metadata.gz: aceddb469a65daa05b5a996bc35bddc70337406c3b1c365288fd7fd5c355a3b8
+  data.tar.gz: 513f1e22fabba232a95d5084e936d9a488514f1c14181568b6b29a223132519c
 SHA512:
-  metadata.gz: 8b0cb4055dfc95cbd774ddacf53a4d7d3a3d8225e92c1aa97d7b317279db51f085ce700872c6bc34ab4b857c1102b4f3090460213ccbeb6fe85768d27b687fa0
-  data.tar.gz: cb635df42bf89ad2e08b33d2704348ac0091c087b36ec458d3f5aa0ceb5eda462339ee8b68fc7a17fde4464b1360b5f7ef94f1076d0531d041ff27e8557fd1e0
+  metadata.gz: 540953d9faed9eb9e31b8fddd6a227caeee5fe5381b2ecf7832817aeb9505313f4cbb0d77bb67627131cef6b15c2912e8af0e803a5fc65998b57d917f34037b0
+  data.tar.gz: 6f0cb5b9c706ef4f41a4af49d6bac8ca58e97c27ee163e33bf170c9dbbe34b59afb82bb11f7ca0da3f9aeb41ef7d38de91da15badfd46891be7affb042b9ba7c

data/bin/stack2.drs

@@ -0,0 +1,7 @@
+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

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] }
@@ -40,13 +41,27 @@ module Dry
                  services: YAML.load(@services.to_yaml),
                  networks: YAML.load(@networks.to_yaml),
       }
+      if @ingress.any?
+        compose[:networks].merge! ingress_routing: {external: true, name: 'ingress-routing'}
+      end
 
       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}" }
+        if @ingress[name]
+          service[:networks] ||= []
+          service[:networks] << 'ingress_routing'
+        end
+
+        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 +82,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.6'
   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.6
 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