dry-stack 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ab4e5cc474243867d1902215d9e0c8f691637f385a3def0cc38e95eb77130ae
-  data.tar.gz: 10cfa1a70397061a5d7a7ed3a6d37eb4b130efa63c2410910bbf691c3fe85d8e
+  metadata.gz: 7966c8d4d90e8f6c2b7b9f011d59392c043e8349bdfaf32af64533d0ac8363e3
+  data.tar.gz: c20e78cc4176fecbe03803089933b8cbb6ce5424e66156c7db0a24ab14ae27d8
 SHA512:
-  metadata.gz: 363dfb68ec8bd172a5e44f553f7393952f7c0aff11f55c81b0062a573a18a63f7a4262404e13cce1c7da34de804cde9da676a9074837d9eb4b758dc355e8876a
-  data.tar.gz: a236bdec6ff3f622212d3b01e524b4ae939d09a826a989563fab76355ce08e9aa3347cfa05f3fe10b86ce7592d590a49c600ee74ab044e0213293a450a386ec0
+  metadata.gz: 65c0854dcde519ad3fbb577c9a5098e92c436a349bab23af6a79fc0db28957391879feed79eacdd13f0e410ff54bfa34754ed8279a7d429ab2d1b280c5645b1e
+  data.tar.gz: 695bfe12d7747d476500a6f927d99ff3bc6d1a86d18e5eb44aec532eb4f9ca1811d0d7a563b9d93492b335e5b7014ff1549a67c2981a8d7d427e8f03d063987e

data/lib/dry-stack/command_compose.rb

@@ -1,8 +1,8 @@
 require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
-  def run(stack, params, args)
-    yaml = stack.to_compose.lines[1..].join
+  def run(stack, params)
+    yaml = stack.to_compose(params).lines[1..].join
 
     # substitute ENV variables
     params[:'no-env'] ? $stdout.puts(yaml) : system("echo \"#{yaml}\"")

data/lib/dry-stack/command_line.rb

@@ -38,6 +38,8 @@ module Dry
           #  in all caps are required
           o.on('-s', '--stack STACK_NAME', 'Stack file')
           o.on('-e', '--env', 'Load .env file') { load_env }
+          o.on('',   '--ingress', 'Generate ingress labels') { true }
+          o.on('',   '--traefik', 'Generate traefik 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
@@ -49,10 +51,10 @@ module Dry
 
           stack_text = $stdin.tty? ? File.read(params[:stack]) : STDIN.read
           Dry::Stack() { eval stack_text }
-          COMMANDS[command.to_sym].run Stack.last_stack, params, args
-        rescue => e
-          puts e.message
-          exit 1
+          COMMANDS[command.to_sym].run Stack.last_stack, params
+        # rescue => e
+        #   puts e.message
+        #   exit 1
         end
       end
     end

data/lib/dry-stack/stack.rb

@@ -27,7 +27,7 @@ module Dry
     end
 
     def initialize(name)
-      @name = name
+      @name = name || 'stack'
       @services = {}
       @networks = {}
       @publish_ports = {}
@@ -36,11 +36,17 @@ module Dry
 
     def stringify(hash) = hash.to_h { |k, v| [k.to_s, v.is_a?(Hash) ? stringify(v) : v] }
 
-    def to_compose
-      compose = {name: @name,
-                 services: YAML.load(@services.to_yaml),
-                 networks: YAML.load(@networks.to_yaml),
+    def nginx_host2regexp(str)
+      str.to_s.gsub('.', '\.').gsub('*', '.*')
+    end
+
+    def to_compose(opts = {})
+      compose = {
+        name: @name.to_s, # https://docs.docker.com/compose/compose-file/#configs-top-level-element
+        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
@@ -48,13 +54,28 @@ module Dry
       compose[:services].each do |name, service|
         @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[:deploy][:labels] ||= []
+
+        if @ingress[name] && (opts[:ingress] || opts[:traefik])
           service[:networks] ||= []
           service[:networks] << 'default' if service[:networks].empty?
           service[:networks] << 'ingress_routing'
         end
 
+        if @ingress[name] && opts[:ingress]
+          service[:deploy][:labels] = @ingress[name]&.map { |k, v| "ingress.#{k}=#{v}" }
+        end
+
+        if @ingress[name] && opts[:traefik]
+          service_name = "#{@name}_#{name}"
+          service[:deploy][:labels] += [
+            'traefik.enable=true',
+            "traefik.http.routers.nginx.service=#{service_name}",
+            "traefik.http.services.#{service_name}.loadbalancer.server.port=#{@ingress[name][:port]}",
+            "traefik.http.routers.nginx.rule=HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)"
+          ]
+        end
+
         service[:ports] = @publish_ports[name]&.zip(service[:ports] || @publish_ports[name])&.map { _1.join ':' }
       end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

metadata

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