dry-stack 0.0.35 → 0.0.37
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 +11 -4
- data/lib/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cc52776646d4ad29e848531dddfdd4e7e5134ce143b67a67767a1b72e24fc6d9
|
4
|
+
data.tar.gz: 4d44aa9270e87628c931e5c4e0ad3ffa8e38332e138875858d880dbd2c0aa49b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b780119d23b4ceabc1a0694883635bc1284dbd07eb232b619bc30a640c315117676f861374cd57bfecaf95e8582505bb461979415152adad8a0e52aa37eb5160
|
7
|
+
data.tar.gz: 9eb4cb230bf4643f0a4a05ea0414fa54cdec5709baca838e7679ac05e1166ba7e9cb06f144ea43882fde3ce92164a1b2515beba495795067cee203001bdd9e8f
|
data/lib/dry-stack/stack.rb
CHANGED
@@ -16,7 +16,7 @@ module Dry
|
|
16
16
|
def image(name)= @service[:image] = name
|
17
17
|
def ports(ports)= ((@service[:ports] ||= []) << ports).flatten!
|
18
18
|
def command(cmd)= @service[:command] = cmd
|
19
|
-
def
|
19
|
+
def deploy_label(str)= @service[:deploy][:labels] << str
|
20
20
|
end
|
21
21
|
|
22
22
|
class Stack
|
@@ -111,9 +111,9 @@ module Dry
|
|
111
111
|
service[:deploy][:labels] = @ingress[name]&.map { |k, v| "ingress.#{k}=#{v}" }
|
112
112
|
end
|
113
113
|
|
114
|
-
|
115
|
-
service_name = "#{@name}_#{name}"
|
114
|
+
service_name = "#{@name}_#{name}"
|
116
115
|
|
116
|
+
if @ingress[name] && (opts[:traefik] || opts[:traefik_tls])
|
117
117
|
service[:deploy][:labels] += [
|
118
118
|
'traefik.enable=true',
|
119
119
|
"traefik.http.routers.#{service_name}.service=#{service_name}",
|
@@ -138,6 +138,13 @@ module Dry
|
|
138
138
|
service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=#{rule.join ' && '}"
|
139
139
|
end
|
140
140
|
|
141
|
+
hash = {'service-name': service_name}
|
142
|
+
hash.default = ''
|
143
|
+
original_verbosity = $VERBOSE
|
144
|
+
$VERBOSE = nil
|
145
|
+
service[:deploy][:labels].map!{ _1 % hash }
|
146
|
+
$VERBOSE = original_verbosity
|
147
|
+
|
141
148
|
service[:deploy].merge! @deploy[name] if @deploy[name]
|
142
149
|
|
143
150
|
pp_i = @publish_ports[name]&.reject { _1.class == String }
|
@@ -162,7 +169,7 @@ module Dry
|
|
162
169
|
opts[:ports] = [opts[:ports]].flatten if opts.key? :ports
|
163
170
|
opts[:environment] = opts.delete(:env) if opts.key? :env
|
164
171
|
|
165
|
-
@services[name] ||= {environment: {}}
|
172
|
+
@services[name] ||= {environment: {}, deploy: {labels: []}}
|
166
173
|
@services[name].merge! opts
|
167
174
|
ServiceFunction.new(@services[name], &) if block_given?
|
168
175
|
end
|
data/lib/version.rb
CHANGED