dry-stack 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ab2983449c4f066166f2959b92de322fc7b9ef9b9c027d46506c01affd26b64
-  data.tar.gz: f23006f3896b4a23810c25b7222d958cee4cac84609b0f56bc11a8c9247a6ad0
+  metadata.gz: 7f98dfb71085af4d05dde33b4f45eb483af0aca4c80350d5940dbec63c2cbd45
+  data.tar.gz: e655689e2114bfbafff227349a874bfeaa3c8b07fc27e7a784ea692957a9b282
 SHA512:
-  metadata.gz: 8b89b2359536654ec416780b5edc2fb2038653c35b2f0287b993858793e3907544f92cd8c8e11b93b1536a7cfb982758ed25766b47f58976e52d8597736590b4
-  data.tar.gz: 30073e42de42e31ff79e575088d8ba1d5e48df3a375277e13aa079a44bc4f9054481ab6f4eccc7fb18726a7a6b785f66ecf1a9b17cb27626baf6f363436ea7ff
+  metadata.gz: 96a1db615d902109194a3600876ebbd6a029681b47fa8e82b8b78efbb61db74532892277fd1ac95fdf02a9a902c095981e0bf51e469f55ff9e5a75a948ec553d
+  data.tar.gz: 7960baa3ef7ebbab1bea4b6c7947fe198ee446402a51121d641e287f44e93e335e5acc3269b42a040a21c7a2b571dee700c29353a0b8f6bca9646258a9194be7

data/lib/dry-stack/command_line.rb

@@ -42,6 +42,7 @@ module Dry
           o.on('',   '--ingress', 'Generate ingress labels') { true }
           o.on('',   '--traefik', 'Generate traefik labels') { true }
           o.on('',   '--traefik_tls', 'Generate traefik tls labels') { true }
+          o.on('',   '--host_sed /from/to/', 'Sed ingress host  /*/dev.*/')
           o.on('-n', '--no-env', 'Do not process env variables') { true }
           o.on('-h', '--help') { puts o; exit }
           o.parse! args, into: params

data/lib/dry-stack/stack.rb

@@ -17,6 +17,7 @@ module Dry
   end
 
   class Stack
+    COMPOSE_VERSION = '3.8'
     class << self
       attr_accessor :last_stack
     end
@@ -29,6 +30,7 @@ module Dry
 
     def initialize(name)
       @name = name || 'stack'
+      @version = COMPOSE_VERSION
       @options = {}
       @services = {}
       @networks = {}
@@ -59,6 +61,7 @@ module Dry
       compose = {
         # name: @name.to_s, # https://docs.docker.com/compose/compose-file/#name-top-level-element
         # Not allowed by docker stack deploy
+        version: @version,
         services: YAML.load(@services.to_yaml),
         networks: YAML.load(@networks.to_yaml),
       }
@@ -72,40 +75,46 @@ module Dry
         service[:deploy] ||= {}
         service[:deploy][:labels] ||= []
 
-        if @ingress[name] && (opts[:ingress] || opts[:traefik])
+        if @ingress[name] && (opts[:ingress] || opts[:traefik] || opts[:traefik_tls])
           service[:networks] ||= []
           service[:networks] << 'default' if service[:networks].empty?
           service[:networks] << 'ingress_routing'
         end
 
+        if opts[:host_sed] && @ingress.dig(name,:host)
+          a, b = opts[:host_sed].split('/').reject(&:empty?)
+          @ingress[name][:host].gsub! %r{#{a}}, b
+        end
+
         if @ingress[name] && opts[:ingress]
           service[:deploy][:labels] = @ingress[name]&.map { |k, v| "ingress.#{k}=#{v}" }
         end
 
-        if @ingress[name] && opts[:traefik]
+        if @ingress[name] && (opts[:traefik] || opts[:traefik_tls])
           service_name = "#{@name}_#{name}"
-          service[:deploy][:labels] += [
-            'traefik.enable=true',
-            "traefik.http.routers.#{service_name}.service=#{service_name}",
-            "traefik.http.services.#{service_name}.loadbalancer.server.port=#{@ingress[name][:port]}",
-            "traefik.http.routers.#{service_name}.rule=HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)"
-          ]
-        end
 
-        if @ingress[name] && opts[:traefik_tls]
-          service_name = "#{@name}_#{name}"
           service[:deploy][:labels] += [
             'traefik.enable=true',
             "traefik.http.routers.#{service_name}.service=#{service_name}",
             "traefik.http.services.#{service_name}.loadbalancer.server.port=#{@ingress[name][:port]}",
-            "traefik.http.routers.#{service_name}.rule=HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)",
-            "traefik.http.routers.#{service_name}.entrypoints=http",
-            "traefik.http.routers.#{service_name}.middlewares=service_stack-https-redirect",
-            "traefik.http.routers.#{service_name}.rule=Host(`${REGISTRY_HOSTNAME}`)",
-            "traefik.http.routers.#{service_name}.entrypoints=https",
-            "traefik.http.routers.#{service_name}.tls=true",
-            "traefik.http.routers.#{service_name}.tls.certresolver=le"
           ]
+
+          if opts[:traefik_tls]
+            service[:deploy][:labels] += [
+              "traefik.http.routers.#{service_name}.entrypoints=http",
+              "traefik.http.routers.#{service_name}.middlewares=service_stack-https-redirect",
+              "traefik.http.routers.#{service_name}.entrypoints=https",
+              "traefik.http.routers.#{service_name}.tls=true",
+              "traefik.http.routers.#{service_name}.tls.certresolver=le"
+            ]
+          end
+
+          if @ingress[name][:host]
+            service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=HostRegexp(`{name:#{nginx_host2regexp @ingress[name][:host]}}`)"
+          end
+          if @ingress[name][:rule]
+            service[:deploy][:labels] << "traefik.http.routers.#{service_name}.rule=#{@ingress[name][:rule]}"
+          end
         end
 
         service[:deploy].merge! @deploy[name] if @deploy[name]

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.16'
+    VERSION = '0.0.18'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-14 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake