dry-stack 0.0.56 → 0.0.57
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 +10 -16
- 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: 3c71ef427e2a4703a3653ef4e804d4e7b6e3f96ebcdbbd238949f397680b0416
|
4
|
+
data.tar.gz: df2eb1ce11120dea1e973863c550e6cad37063bf9469563909ef17fd584f0131
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a006773cc22c9c1eb18bdb297bca0fef62436daf40c09129c28dec205565339820407c764fbf55ff3746ca1c6488c3958e304cd939d16913489adca33196ca4a
|
7
|
+
data.tar.gz: cc0350b67c82ae974fb0567d0722c32ceb91902677264ac69b88a38617f1868cfa1bb4574d35a66e74c32a225f7b208922173ec010d841596eb88709303c3f92
|
data/lib/dry-stack/stack.rb
CHANGED
@@ -68,14 +68,6 @@ module Dry
|
|
68
68
|
@logging = {}
|
69
69
|
end
|
70
70
|
|
71
|
-
def stringify(obj)
|
72
|
-
case
|
73
|
-
when obj.is_a?(Hash); obj.to_h { |k, v| [k.to_s, stringify(v)] }
|
74
|
-
when obj.is_a?(Array); obj.map { stringify(_1) }
|
75
|
-
else obj
|
76
|
-
end
|
77
|
-
end
|
78
|
-
|
79
71
|
def expand_hash(hash)
|
80
72
|
hash.select { _1.to_s =~ /\./ }.each do |k, v|
|
81
73
|
name = k.to_s.scan(/([^\.]*)\.(.*)/).flatten
|
@@ -133,15 +125,11 @@ module Dry
|
|
133
125
|
end
|
134
126
|
end
|
135
127
|
|
136
|
-
if ingress[0] && opts[:ingress]
|
137
|
-
ingress[0][:port] ||= service[:ports]&.first
|
138
|
-
service[:deploy][:labels] = ingress[0]&.map { |k, v| "ingress.#{k}=#{v}" }
|
139
|
-
end
|
140
|
-
|
141
128
|
service_name = "#{@name}_#{name}"
|
142
129
|
|
143
130
|
if ingress[0] && (opts[:traefik] || opts[:traefik_tls])
|
144
131
|
service[:deploy][:labels] << 'traefik.enable=true'
|
132
|
+
ingress[0][:port] ||= service[:ports]&.first
|
145
133
|
|
146
134
|
ingress.each_with_index do |ing, index|
|
147
135
|
ing[:port] ||= service[:ports]&.first
|
@@ -185,6 +173,8 @@ module Dry
|
|
185
173
|
service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
|
186
174
|
|
187
175
|
service[:environment] = @environment[name].merge(service[:environment]) if @environment[name]
|
176
|
+
service[:environment].merge! STACK_NAME: @name, STACK_SERVICE_NAME: name
|
177
|
+
|
188
178
|
service[:environment].transform_values! { !!_1 == _1 ? _1.to_s : _1 } # (false|true) to string
|
189
179
|
service[:logging] ||= @logging[name.to_sym]
|
190
180
|
end
|
@@ -206,11 +196,15 @@ module Dry
|
|
206
196
|
}
|
207
197
|
prune[compose]
|
208
198
|
|
209
|
-
each_recursive compose do |_path, node,
|
210
|
-
|
199
|
+
each_recursive _root: compose do |_path, node, v|
|
200
|
+
v.transform_keys!(&:to_s) if v.is_a? Hash
|
201
|
+
node.transform_keys!(&:to_s) if node.is_a? Hash
|
202
|
+
_path.last[node] = v.to_s if v.is_a? Symbol
|
203
|
+
|
204
|
+
_path.last[node] = v.to_s if node.to_s == 'fluentd-async'
|
211
205
|
end
|
212
206
|
|
213
|
-
|
207
|
+
compose.to_yaml
|
214
208
|
end
|
215
209
|
|
216
210
|
def PublishPorts(ports)
|
data/lib/version.rb
CHANGED