dry-stack 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6b0981566e92e24a2da8878f387d0db385cf91c330bdbdf85cafd99f2c57561
-  data.tar.gz: f1a39d9413754ebe20c0249f9e7ea2c344c136387c0211ab9aa98c7fc37b4a24
+  metadata.gz: 2ab4e5cc474243867d1902215d9e0c8f691637f385a3def0cc38e95eb77130ae
+  data.tar.gz: 10cfa1a70397061a5d7a7ed3a6d37eb4b130efa63c2410910bbf691c3fe85d8e
 SHA512:
-  metadata.gz: b81863c9ebe1e517bdb3e3060e80673ea0ea870c307519c44ef0464bdd04f9aef5a0a18945973bc6d4fd97cb4dfe79822fa3d0511500366bcf05f7e360dbcad1
-  data.tar.gz: 3de0c4bd30868e4c82763d642e4b3904915ce3351dea066ae95b2933ee624aeded11bc4792afac46e8e6369797625c83ad15cf7be5d2bbcb9d1b8f20fb38b5ae
+  metadata.gz: 363dfb68ec8bd172a5e44f553f7393952f7c0aff11f55c81b0062a573a18a63f7a4262404e13cce1c7da34de804cde9da676a9074837d9eb4b758dc355e8876a
+  data.tar.gz: a236bdec6ff3f622212d3b01e524b4ae939d09a826a989563fab76355ce08e9aa3347cfa05f3fe10b86ce7592d590a49c600ee74ab044e0213293a450a386ec0

data/bin/stack2.drs

@@ -5,4 +5,3 @@ Service :admin,     image: '$REGISTRY_HOST/frontend',  env: { APP: 'admin' },
 Service :reports,   image: '$REGISTRY_HOST/reports', env: { DB_URL: '$DB_URL' }
 
 Network :default, attachable: true
-Network :ingress_routing, external: true, name: 'ingress-routing'

data/lib/dry-stack/stack.rb

@@ -41,11 +41,19 @@ module Dry
                  services: YAML.load(@services.to_yaml),
                  networks: YAML.load(@networks.to_yaml),
       }
+      if @ingress.any?
+        compose[:networks].merge! ingress_routing: {external: true, name: 'ingress-routing'}
+      end
 
       compose[:services].each do |name, service|
         @ingress[name][:port] ||= service[:ports]&.first if @ingress[name]
         service[:deploy] ||= {}
         service[:deploy][:labels] = @ingress[name]&.map { |k, v| "ingress.#{k}=#{v}" }
+        if @ingress[name]
+          service[:networks] ||= []
+          service[:networks] << 'default' if service[:networks].empty?
+          service[:networks] << 'ingress_routing'
+        end
 
         service[:ports] = @publish_ports[name]&.zip(service[:ports] || @publish_ports[name])&.map { _1.join ':' }
       end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.5'
+    VERSION = '0.0.7'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Artyom B