dry-stack 0.0.70 → 0.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 347130396d5cf0de94694fdc5d5edcce940833d0dd4e7c05726fa218c0669801
-  data.tar.gz: c62702ddffe13310445c8c830fa5cabb06763ed9ae71477d4e41e15c7f8239c5
+  metadata.gz: '068cf557c3a44aece001366bcd147616d4e6aafc3db1f6941a7b0b79c3db6799'
+  data.tar.gz: f73cdb06ddd54b2ea5b9744257172a196af3b34a4b08039580e4391e59959f67
 SHA512:
-  metadata.gz: 738b139b5a8ead311d1c1445a88418cdf0d31f4c18a6e200515338f32a6dd041c9e324dffb998b3df9f19d8ed1323c34b340027ef3786b6c43152ce27f007973
-  data.tar.gz: 5f67d76cf8c9d3ebb4b4b8e21dd71d6a420dfa514c955bae2c23dc6d12005d3793587c91895992f767efd18c2d16d884bbd416f39fec995f5535873985336fe6
+  metadata.gz: daf9793fd47e3c90114bf80c0d05fc07ca29e8ff8c28b017a86da6b1a37887492926c350b19f7fdc6e957642a87485c043e2e6f737fcb0117848335e5e6c6613
+  data.tar.gz: 1d8bcbc7a6f7105196686f12a9cdde4ddfc0ee5f37fa75be96b79d1c3c9ba41db7c9a4a116ea5cf07a7a547b6e1a2a84e39fd124d57b6d3138e58f8843a87716

data/bin/stack.drs

@@ -9,6 +9,11 @@ SwarmDeploy :sky_gates do
   env REGISTRY_HOST: '10.100.0.2:5000'
 end
 
+Deploy [:admin, :operator], labels: [
+  'traefik.http.middlewares.%{service-name}_auth.basicauth.users=admin:$apr1$i7hdbc9g$Rkocxo9snhmuESvUg0TTv/',
+  "traefik.http.routers.%{service-name}.middlewares=%{service-name}_auth"
+]
+
 PublishPorts admin: 4000, operator: 4001, navigator: 4002, reports: 7000 # mode: ingress, protocol: tcp
 
 Service :admin,     image: 'frontend', env: {APP: 'admin'},     ports: 5000

data/lib/dry-stack/stack.rb

@@ -182,16 +182,16 @@ module Dry
         service[:environment].merge! STACK_NAME: @name.to_s, STACK_SERVICE_NAME: name.to_s
         service[:environment].transform_values! { !!_1 == _1 ? _1.to_s : _1 } # (false|true) to string
 
+        service[:deploy].merge! @deploy[name] if @deploy[name]
+
         hash = {'service-name': service_name, 'stack-name': @name}
         hash.default = ''
         original_verbosity = $VERBOSE
         $VERBOSE = nil
-        service[:deploy][:labels].map!{ _1 % hash }
+        service[:deploy][:labels] = service[:deploy][:labels].map{ _1 % hash }
         service[:environment].transform_values!{ _1.is_a?(String) ? (_1 % hash) : _1 }
         $VERBOSE = original_verbosity
 
-        service[:deploy].merge! @deploy[name] if @deploy[name]
-
         pp_i = @publish_ports[name]&.reject { _1.class == String }
         pp_s = @publish_ports[name]&.select { _1.class == String }
         service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.70'
+    VERSION = '0.0.71'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.71
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-01 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake