dry-stack 0.0.31 → 0.0.33
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dry-stack/stack.rb +9 -2
- data/lib/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e33c1b51112cbf166dd5a8d166405cc8e7617a14f4961eb6776dcdcce765a40a
|
4
|
+
data.tar.gz: ca3daad662942c57469f066ec8149042f5ca48f368aff06cd48eda4844d205ca
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 51ec8e8c3e4e4567d46f6224e8f6fa2738c14af4e6670155a06cdfe79da08fa41ef2ee94189bb2eada38978837f8368a9d4a319a1c013140db9f1181a6ace15a
|
7
|
+
data.tar.gz: 4a047564fc92b6c92bb344f2132cfc3040064816c275b63ce0f5a5758547c6cc4a04f3c358b1fffc67d57d85cdea3ee6f2708d403945ae0659d55cec4fc2a9a6
|
data/lib/dry-stack/stack.rb
CHANGED
@@ -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
|
-
|
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
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.
|
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-
|
11
|
+
date: 2023-07-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|