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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 375d68c0be7044499bf4f5a27b4c2f8471139e1f6365ebd28b09db7b1cd34bf7
4
- data.tar.gz: 1c39ce3cc0828f694a3a2e596558210997a2909141dc7b53f200ad40e664fedd
3
+ metadata.gz: cc52776646d4ad29e848531dddfdd4e7e5134ce143b67a67767a1b72e24fc6d9
4
+ data.tar.gz: 4d44aa9270e87628c931e5c4e0ad3ffa8e38332e138875858d880dbd2c0aa49b
5
5
  SHA512:
6
- metadata.gz: 347d74a6d5a831ca7065cce1545fa4d3fc3875f0ce6ea48dcecacede7069e4bb36aa72f47d26915bb9115365a53b836e7de8fddc4e87ffa000175817ff794088
7
- data.tar.gz: bfbb8c4df195fda521414f23f4b571e14772a2d16480d6d5ae080d2a0de7b7d53272b6eb47e1353d2b70c865017f6b77fe943fe40f42dbc49c7e568dcbc43e4a
6
+ metadata.gz: b780119d23b4ceabc1a0694883635bc1284dbd07eb232b619bc30a640c315117676f861374cd57bfecaf95e8582505bb461979415152adad8a0e52aa37eb5160
7
+ data.tar.gz: 9eb4cb230bf4643f0a4a05ea0414fa54cdec5709baca838e7679ac05e1166ba7e9cb06f144ea43882fde3ce92164a1b2515beba495795067cee203001bdd9e8f
@@ -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 label(str)= (@service[:labels] ||= []) << str
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
- if @ingress[name] && (opts[:traefik] || opts[:traefik_tls])
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
@@ -1,5 +1,5 @@
1
1
  module Dry
2
2
  class Stack
3
- VERSION = '0.0.35'
3
+ VERSION = '0.0.37'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dry-stack
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.35
4
+ version: 0.0.37
5
5
  platform: ruby
6
6
  authors:
7
7
  - Artyom B