dry-stack 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b042eab1b6fa003ac8c4f3f92bded92fba4949bd664eb33c3632fe9b21cff3d
-  data.tar.gz: 9fcf393c3e78ae50995276375e4d827c00576aa5d5f0f5aff3f31694d32f81a9
+  metadata.gz: 74db3949077357c4b9e22706547e9075a0d49e58fa677c95e763d19835819834
+  data.tar.gz: 3dc0469e7a7620c44d53f92246626ea21db39c9608a53519983d194bfed6e3c0
 SHA512:
-  metadata.gz: c3df1ae9f302a552c5e681f0b8ffd0efe1edfad71433e63c7552984381ad11dffb72ccd6dae3f7d9f6bbcfdbdb211ada225278d364d2d365ee8d1df024065e43
-  data.tar.gz: 9b6a4964c7345421e135e75f33969bcac512452d2ef9ae271e1850111d0ce30ea1f43d9f8aa05d277797285a852162f6f8f21bb34938c1858e70f38e3b1435f0
+  metadata.gz: 33f32d96133400cca1c21dc58cc22f3cbf05504605f297c8809c15064a59ed79b761a10c67fe68b1c7621c5bd33809d2252c83a7594b9060a556238bb247f165
+  data.tar.gz: 16dcc21007ff1a3ed8cafa14b53d21e3a1edefa7086a07d1dc79658a920645199722e3273c7a8b6c8b1e032ec73840188b65d432ec5bb1eb44aa78f9616a312f

data/bin/stack2.drs

@@ -1,5 +1,6 @@
 PublishPorts reports: 7000
 Ingress reports: {host: 'reports.*', protocol: :http, port: 7000}
+Deploy admin: { replica: 2, 'resources.limits': { cpus: 4, memory: '500M' } }
 
 Service :admin,     image: '$REGISTRY_HOST/frontend',  env: { APP: 'admin' },      ports: 5000
 Service :reports,   image: '$REGISTRY_HOST/reports', env: { DB_URL: '$DB_URL' }

data/lib/dry-stack/command_compose.rb

@@ -2,10 +2,11 @@ require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
   def run(stack, params)
-    yaml = stack.to_compose(params).lines[1..].join
+    _params = stack.options.merge params
+    yaml = stack.to_compose(_params).lines[1..].join
 
     # substitute ENV variables
-    params[:'no-env'] ? $stdout.puts(yaml) : system("echo \"#{yaml.gsub("`", '\\\`')}\"")
+    _params[:'no-env'] ? $stdout.puts(yaml) : system("echo \"#{yaml.gsub("`", '\\\`')}\"")
   end
 
   def help = 'Print stack in docker compose format'

data/lib/dry-stack/command_line.rb

@@ -41,6 +41,7 @@ module Dry
           o.on('',   '--name STACK_NAME', 'Define stack name')
           o.on('',   '--ingress', 'Generate ingress labels') { true }
           o.on('',   '--traefik', 'Generate traefik labels') { true }
+          o.on('',   '--traefik_tls', 'Generate traefik tls labels') { true }
           o.on('-n', '--no-env', 'Do not process env variables') { true }
           o.on('-h', '--help') { puts o; exit }
           o.parse! args, into: params

data/lib/dry-stack/stack.rb

@@ -20,7 +20,7 @@ module Dry
     class << self
       attr_accessor :last_stack
     end
-    attr_accessor :name
+    attr_accessor :name, :options
 
     def Stack(name = nil, &)
       Stack.last_stack = Stack.new name
@@ -29,19 +29,33 @@ module Dry
 
     def initialize(name)
       @name = name || 'stack'
+      @options = {}
       @services = {}
       @networks = {}
       @publish_ports = {}
       @ingress = {}
+      @deploy = {}
     end
 
     def stringify(hash) = hash.to_h { |k, v| [k.to_s, v.is_a?(Hash) ? stringify(v) : v] }
+    def expand_hash(hash)
+      hash.select { _1.to_s =~ /\./ }.each do |k, v|
+        name = k.to_s.scan(/([^\.]*)\.(.*)/).flatten
+        hash.delete k
+        hash[name[0]] ||= {}
+        hash[name[0]][name[1]] ||= {}
+        hash[name[0]][name[1]].merge! v if v.is_a?(Hash)
+        hash[name[0]][name[1]] = v unless v.is_a?(Hash)
+      end
+      hash.each { expand_hash(_2) if _2.is_a?(Hash) }
+      hash
+    end
 
     def nginx_host2regexp(str)
       str.to_s.gsub('.', '\.').gsub('*', '.*')
     end
 
-    def to_compose(opts = {})
+    def to_compose(opts = @options )
       compose = {
         # name: @name.to_s, # https://docs.docker.com/compose/compose-file/#name-top-level-element
         # Not allowed by docker stack deploy
@@ -78,6 +92,24 @@ module Dry
           ]
         end
 
+        if @ingress[name] && opts[:traefik_tls]
+          service_name = "#{@name}_#{name}"
+          service[:deploy][:labels] += [
+            'traefik.enable=true',
+            "traefik.http.routers.#{service_name}.service=#{service_name}",
+            "traefik.http.services.#{service_name}.loadbalancer.server.port=#{@ingress[name][:port]}",
+            "traefik.http.routers.#{service_name}.rule=HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)",
+            "traefik.http.routers.#{service_name}.entrypoints=http",
+            "traefik.http.routers.#{service_name}.middlewares=service_stack-https-redirect",
+            "traefik.http.routers.#{service_name}.rule=Host(`${REGISTRY_HOSTNAME}`)",
+            "traefik.http.routers.#{service_name}.entrypoints=https",
+            "traefik.http.routers.#{service_name}.tls=true",
+            "traefik.http.routers.#{service_name}.tls.certresolver=le"
+          ]
+        end
+
+        service[:deploy].merge! @deploy[name] if @deploy[name]
+
         service[:ports] = @publish_ports[name]&.zip(service[:ports] || @publish_ports[name])&.map { _1.join ':' }
       end
 
@@ -106,10 +138,18 @@ module Dry
       ServiceFunction.new(@services[name], &)  if block_given?
     end
 
+    def Options(opts)
+      @options.merge! opts
+    end
+
     def Ingress(services)
       @ingress.merge! services
     end
 
+    def Deploy(services)
+      @deploy.merge! expand_hash(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.12'
+    VERSION = '0.0.14'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake