update

Author: artyomb

Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby File.read(File.expand_path('.ruby-version', __dir__)).strip
+# ruby File.read(File.expand_path('.ruby-version', __dir__)).strip
 
 gemspec
 # gem 'dry-sack', path: '.'

lib/dry-stack/stack.rb

@@ -193,7 +193,13 @@ def to_compose(opts = @options)
 
             if ing[:host_sni]
               domain = opts[:tls_domain] || 'example.com'
-              domain = ing[:host_sni].gsub('.*', ".#{domain}") if ing[:host_sni]&.include?('*')
+
+              if ing[:host_sni]&.include?('*')
+                domain = ing[:host_sni].gsub('.*', ".#{domain}")
+              else
+                domain = ing[:host_sni]
+              end
+
               domain = ing[:tls_domain] if ing[:tls_domain]
 
               ing[:passthrough] = false unless ing.key? :passthrough
@@ -221,7 +227,14 @@ def to_compose(opts = @options)
 
               if opts[:traefik_tls]
                 domain = opts[:tls_domain] || 'example.com'
-                domain = ing[:host].gsub('.*', ".#{domain}") if ing[:host]&.include?('.*')
+                if ing[:host]
+                  if ing[:host]&.include?('*')
+                    domain = ing[:host].gsub('*', domain)
+                  else
+                    domain = ing[:host]
+                  end
+                end
+
                 domain = ing[:tls_domain] if ing[:tls_domain]
                 service[:deploy][:labels] += [
                   "traefik.http.routers.#{service_name}-#{index}.tls=true",
@@ -527,4 +540,3 @@ def Configuration(name, opts = {}, &b)
 
   end
 end
-

lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.53'
+    VERSION = '0.1.54'
   end
 end

spec/data/stack9-compose.yml

@@ -21,6 +21,48 @@ services:
       ingress_routing:
     init: true
     image: "$REGISTRY_HOST/frontend"
+  admin2:
+    environment:
+      STACK_NAME: stack
+      STACK_SERVICE_NAME: admin2
+    deploy:
+      labels:
+      - traefik.enable=true
+      - traefik.http.routers.stack_admin2-0.service=stack_admin2-0
+      - traefik.http.services.stack_admin2-0.loadbalancer.server.port=5000
+      - traefik.http.routers.stack_admin2-0.tls=true
+      - traefik.http.routers.stack_admin2-0.tls.certresolver=le
+      - traefik.http.routers.stack_admin2-0.tls.domains[0].main=admin.test.com
+      - traefik.http.routers.stack_admin2-0.rule=HostRegexp(`{name:admin\.test\.com}`)
+      - traefik.tcp.routers.stack_admin2-1.tls=true
+      - traefik.tcp.routers.stack_admin2-1.tls.certresolver=le
+      - traefik.tcp.routers.stack_admin2-1.tls.domains[0].main=pgsql-override.admin.test.com
+      - traefik.tcp.routers.stack_admin2-1.rule=HostSNI(`pgsql-override.admin.test.com`)
+      - traefik.tcp.routers.stack_admin2-1.tls.passthrough=true
+      - traefik.tcp.routers.stack_admin2-1.service=stack_admin2-1
+      - traefik.tcp.routers.stack_admin2-1.entrypoints=postgres
+      - traefik.tcp.services.stack_admin2-1.loadbalancer.server.port=5432
+      - traefik.tcp.routers.stack_admin2-2.tls=true
+      - traefik.tcp.routers.stack_admin2-2.tls.certresolver=le
+      - traefik.tcp.routers.stack_admin2-2.tls.domains[0].main=test1.example.com
+      - traefik.tcp.routers.stack_admin2-2.rule=HostSNI(`test1.example.com`)
+      - traefik.tcp.routers.stack_admin2-2.tls.passthrough=false
+      - traefik.tcp.routers.stack_admin2-2.service=stack_admin2-2
+      - traefik.tcp.routers.stack_admin2-2.entrypoints=postgres
+      - traefik.tcp.services.stack_admin2-2.loadbalancer.server.port=5000
+      - traefik.tcp.routers.stack_admin2-3.tls=true
+      - traefik.tcp.routers.stack_admin2-3.tls.certresolver=le
+      - traefik.tcp.routers.stack_admin2-3.tls.domains[0].main=test2-override.admin.test.com
+      - traefik.tcp.routers.stack_admin2-3.rule=HostSNI(`test2-override.admin.test.com`)
+      - traefik.tcp.routers.stack_admin2-3.tls.passthrough=false
+      - traefik.tcp.routers.stack_admin2-3.service=stack_admin2-3
+      - traefik.tcp.routers.stack_admin2-3.entrypoints=postgres
+      - traefik.tcp.services.stack_admin2-3.loadbalancer.server.port=5000
+    networks:
+      default:
+      ingress_routing:
+    init: true
+    image: "$REGISTRY_HOST/frontend"
 networks:
   ingress_routing:
     external: true

spec/data/stack9.drs

@@ -3,3 +3,12 @@ Options traefik_tls: true
 Ingress admin: {host: '~(admin|some)\..*', path: '/bar', tls_domain: 'admin.test.com'}
 
 Service :admin,     image: '$REGISTRY_HOST/frontend',  env: { APP: 'admin' },      ports: 5000
+
+
+Service :admin2,    image: '$REGISTRY_HOST/frontend', ports: 5000,
+        ingress: [
+          { host: 'admin.test.com' },
+          { host_sni: 'pgsql.*', passthrough: true, port: 5432, entrypoints: 'postgres', tls_domain: 'pgsql-override.admin.test.com' },
+          { host_sni: 'test1.*', entrypoints: 'postgres' },
+          { host_sni: 'test2.*', tls_domain: 'test2-override.admin.test.com', entrypoints: 'postgres' }
+        ]