dry-stack 0.0.31 → 0.0.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2d15a946b86497d529dc191697a55abb8ff207dd70da6807640b7a87ef4f2269
4
- data.tar.gz: b17a4ac10cdc98485cb31aec4ddf4d68e46bc5486dbf163312c6536ef437bde2
3
+ metadata.gz: e33c1b51112cbf166dd5a8d166405cc8e7617a14f4961eb6776dcdcce765a40a
4
+ data.tar.gz: ca3daad662942c57469f066ec8149042f5ca48f368aff06cd48eda4844d205ca
5
5
  SHA512:
6
- metadata.gz: 90e203c189bedd2dea18e0fe4407d7992d5173a5a74eaf055af9b1350ad700a9da4313e6e9d6bb548a924c2d9a122e198b7351f4ea9a4dfc685ce0c2b1d8135d
7
- data.tar.gz: 949c056d38082987d914d81da31a6ec832b1b06fe16a5e8504f64d113f8234370b353061aa371961d664e6c109e62312f95240f496e01ab4913527890d71aa1c
6
+ metadata.gz: 51ec8e8c3e4e4567d46f6224e8f6fa2738c14af4e6670155a06cdfe79da08fa41ef2ee94189bb2eada38978837f8368a9d4a319a1c013140db9f1181a6ace15a
7
+ data.tar.gz: 4a047564fc92b6c92bb344f2132cfc3040064816c275b63ce0f5a5758547c6cc4a04f3c358b1fffc67d57d85cdea3ee6f2708d403945ae0659d55cec4fc2a9a6
@@ -120,12 +120,16 @@ module Dry
120
120
  ]
121
121
 
122
122
  if opts[:traefik_tls]
123
+ domain = opts[:tls_domain] || 'example.com'
124
+ domain = @ingress[name][:host].gsub('.*', ".#{domain}") if @ingress[name][:host]
125
+ domain = @ingress[name][:tls_domain] if @ingress[name][:tls_domain]
123
126
  service[:deploy][:labels] += [
124
127
  "traefik.http.routers.#{service_name}.entrypoints=http",
125
128
  "traefik.http.routers.#{service_name}.middlewares=service_stack-https-redirect",
126
129
  "traefik.http.routers.#{service_name}.entrypoints=https",
127
130
  "traefik.http.routers.#{service_name}.tls=true",
128
- "traefik.http.routers.#{service_name}.tls.certresolver=le"
131
+ "traefik.http.routers.#{service_name}.tls.certresolver=le",
132
+ "traefik.http.routers.#{service_name}.tls.domains[0].main=#{domain}"
129
133
  ]
130
134
  end
131
135
 
@@ -138,7 +142,10 @@ module Dry
138
142
 
139
143
  service[:deploy].merge! @deploy[name] if @deploy[name]
140
144
 
141
- service[:ports] = @publish_ports[name]&.zip(service[:ports] || @publish_ports[name])&.map { _1.join ':' }
145
+ pp_i = @publish_ports[name]&.reject { _1.class == String }
146
+ pp_s = @publish_ports[name]&.select { _1.class == String }
147
+ service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }
148
+ service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
142
149
  end
143
150
 
144
151
  prune = ->(o) {
data/lib/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Dry
2
2
  class Stack
3
- VERSION = '0.0.31'
3
+ VERSION = '0.0.33'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dry-stack
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.31
4
+ version: 0.0.33
5
5
  platform: ruby
6
6
  authors:
7
7
  - Artyom B
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-07-12 00:00:00.000000000 Z
11
+ date: 2023-07-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake