dry-stack 0.0.31 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d15a946b86497d529dc191697a55abb8ff207dd70da6807640b7a87ef4f2269
-  data.tar.gz: b17a4ac10cdc98485cb31aec4ddf4d68e46bc5486dbf163312c6536ef437bde2
+  metadata.gz: e33c1b51112cbf166dd5a8d166405cc8e7617a14f4961eb6776dcdcce765a40a
+  data.tar.gz: ca3daad662942c57469f066ec8149042f5ca48f368aff06cd48eda4844d205ca
 SHA512:
-  metadata.gz: 90e203c189bedd2dea18e0fe4407d7992d5173a5a74eaf055af9b1350ad700a9da4313e6e9d6bb548a924c2d9a122e198b7351f4ea9a4dfc685ce0c2b1d8135d
-  data.tar.gz: 949c056d38082987d914d81da31a6ec832b1b06fe16a5e8504f64d113f8234370b353061aa371961d664e6c109e62312f95240f496e01ab4913527890d71aa1c
+  metadata.gz: 51ec8e8c3e4e4567d46f6224e8f6fa2738c14af4e6670155a06cdfe79da08fa41ef2ee94189bb2eada38978837f8368a9d4a319a1c013140db9f1181a6ace15a
+  data.tar.gz: 4a047564fc92b6c92bb344f2132cfc3040064816c275b63ce0f5a5758547c6cc4a04f3c358b1fffc67d57d85cdea3ee6f2708d403945ae0659d55cec4fc2a9a6

data/lib/dry-stack/stack.rb

@@ -120,12 +120,16 @@ module Dry
           ]
 
           if opts[:traefik_tls]
+            domain = opts[:tls_domain] || 'example.com'
+            domain = @ingress[name][:host].gsub('.*', ".#{domain}") if @ingress[name][:host]
+            domain = @ingress[name][:tls_domain] if @ingress[name][:tls_domain]
             service[:deploy][:labels] += [
               "traefik.http.routers.#{service_name}.entrypoints=http",
               "traefik.http.routers.#{service_name}.middlewares=service_stack-https-redirect",
               "traefik.http.routers.#{service_name}.entrypoints=https",
               "traefik.http.routers.#{service_name}.tls=true",
-              "traefik.http.routers.#{service_name}.tls.certresolver=le"
+              "traefik.http.routers.#{service_name}.tls.certresolver=le",
+              "traefik.http.routers.#{service_name}.tls.domains[0].main=#{domain}"
             ]
           end
 
@@ -138,7 +142,10 @@ module Dry
 
         service[:deploy].merge! @deploy[name] if @deploy[name]
 
-        service[:ports] = @publish_ports[name]&.zip(service[:ports] || @publish_ports[name])&.map { _1.join ':' }
+        pp_i = @publish_ports[name]&.reject { _1.class == String }
+        pp_s = @publish_ports[name]&.select { _1.class == String }
+        service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }
+        service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
       end
 
       prune = ->(o) {

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.31'
+    VERSION = '0.0.33'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.33
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake