dry-stack 0.0.22 → 0.0.23

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: 55e317ea140503d8164434f5a4abc2321d65eaff310ebc6cf80ae5529a4d3abe
4
- data.tar.gz: 11fc30b8a8801322529f3a87fa58fcd47350a7f43b4fec7f793d6c3fd69a4ca4
3
+ metadata.gz: bfb8ffaf710f9d58f71f56554b7310d17b38215860675ad63f97b31416fe36f1
4
+ data.tar.gz: 489a51ee4a0893571125a944d0be55fb8d69e5a8cbca2353b247635858185124
5
5
  SHA512:
6
- metadata.gz: 376e6a6dc0f72723d1419d7ebf213ac37ed07c2e99637e9d9e3a4462b3ceffb969efe82f7efa33870b5f72c22cf7b677828448f26ce496322870dda7b5947b4a
7
- data.tar.gz: 10bd76dfa67a25ebb9086915352e9bf20efa3c734b02b5e8161d0f8bea5f58c1e0a5178516b5834ba05b02ca56b2c390b055fa71fbfa8223c8efc0687f46c0f6
6
+ metadata.gz: 81523c3a7e5f22b5b62301509ff964e8440767e6d6f88cd38d80026826d9e89397895086168a55714b3c01ea469e01825630a9ccf0731bbc311999f411b62bd6
7
+ data.tar.gz: 4f1718ff29fffe77761acc41e14b194b5cd5384a891965c32d3d499f98d7df532fb7cd6da2bd7a75f7df50f76bd63b38be19f8bd30d69ee7851768cc226e1dd4
@@ -109,12 +109,11 @@ module Dry
109
109
  ]
110
110
  end
111
111
 
112
- if @ingress[name][:host]
113
- service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)"
114
- end
115
- if @ingress[name][:rule]
116
- service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=#{@ingress[name][:rule]}"
117
- end
112
+ rule = []
113
+ rule << "HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)" if @ingress[name][:host]
114
+ rule << "Path(`#{@ingress[name][:path]}`)" if @ingress[name][:path]
115
+ rule << "#{@ingress[name][:rule]}" if @ingress[name][:rule]
116
+ service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=#{rule.join ' && '}"
118
117
  end
119
118
 
120
119
  service[:deploy].merge! @deploy[name] if @deploy[name]
data/lib/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Dry
2
2
  class Stack
3
- VERSION = '0.0.22'
3
+ VERSION = '0.0.23'
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.22
4
+ version: 0.0.23
5
5
  platform: ruby
6
6
  authors:
7
7
  - Artyom B