dry-stack 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5f21e65df1e5cdb3f6fc7d28dd4c4f3e9c66db5de746af952d0353da1ecc4cb
-  data.tar.gz: 1cad2e0cf7cf1def43213d490173445db4df8036332b4ded90fd6095a552d8f3
+  metadata.gz: d42bc27824db9d5bda598e74265ca0326d261e12d9ee73b61b81d7daa1170aad
+  data.tar.gz: bb9830c13ea1c85bd0996a204a6689c568064d48f46f94cc30580e4f4d923d84
 SHA512:
-  metadata.gz: 68640915ff636f73f85a5d3cf4be792aeaa541b3887c8b8da996d640193c49c839997639fe22f1bfc2d7b25c99cd41a479983ebed555a834480ad36fab4eb63c
-  data.tar.gz: cb262611e2c731eb9af706f267e2b40d7253ee070a774353ae89b956a330d4451525acb7196dc8e70f89443bfdb214bf76d1d485ae7f780a30f9f32f21995033
+  metadata.gz: 1787666d13ac41d16fe254faf5a2619fa22f50cf41b9c84d499a5ac3946112008b8931de1b59f78d0032faecd24e3a2c9f07a5c8542852af5eb6bfd53df453ca
+  data.tar.gz: 1689a7fdba3a87cc7665feef60c5f35ed8cb9715fe2ad41f1608ff5567e006ed2034d77a12e7c1c612acb1c46a412c2cd5c9efa02f306079cbccb0917cfe3f31

data/bin/stack.drs

@@ -1,6 +1,3 @@
-HttpFront services: {admin: 'admin.*', operator: 'operator.*', reports: 'reports.*',
-                     navigator: 'navigator.*', backend: 'admin.*, operator.*, navigator.*'}
-
 PublishPorts admin: 4000, operator: 4001, navigator: 4002, reports: 7000 # mode: ingress, protocol: tcp
 
 Service :admin,     image: 'frontend', env: {APP: 'admin'},     ports: 5000

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

@@ -20,14 +20,14 @@ module Dry
 
         ARGV << '-h' if ARGV.empty?
         OptionParser.new do |o|
-          o.version = "v#{Dry::Stack::VERSION}"
+          o.version = "#{Dry::Stack::VERSION}"
 
           usage = [
             'dry-stack -s stackfile [options] COMMAND',
             'cat stackfile | dry-stack COMMAND',
             'dry-stack COMMAND < stack.drs'
           ]
-          o.banner = "Usage:\n\t#{usage.join "\n\t"}"
+          o.banner = "Version: #{o.version}\nUsage:\n\t#{usage.join "\n\t"}"
           o.separator ''
           o.separator 'Commands:'
           COMMANDS.each { |name, cmd| o.separator "#{' ' * 5}#{name} -  #{cmd.help}" }
@@ -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,6 +29,7 @@ module Dry
 
     def initialize(name)
       @name = name || 'stack'
+      @options = {}
       @services = {}
       @networks = {}
       @publish_ports = {}
@@ -54,7 +55,7 @@ module Dry
       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
@@ -91,6 +92,22 @@ 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 ':' }
@@ -104,10 +121,6 @@ module Dry
       stringify(compose).to_yaml
     end
 
-    def HttpFront(params)
-      yield if block_given?
-    end
-
     def PublishPorts(ports)
       @publish_ports = ports.to_h { |k, v| [k,[v].flatten] }
     end
@@ -121,6 +134,11 @@ module Dry
       ServiceFunction.new(@services[name], &)  if block_given?
     end
 
+    def Options(opts)
+      warn 'WARN: Options command is used for testing purpose. Not recommended in real life configurations.'
+      @options.merge! opts
+    end
+
     def Ingress(services)
       @ingress.merge! services
     end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.13'
+    VERSION = '0.0.15'
   end
 end

metadata

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