dry-stack 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ebf65f6db6234c39d5bfe0b4b6c0be4dc1a2528a361a497b3aa80d093b3e02
-  data.tar.gz: 823bc35c24d568a2c76b4ed921e13e2ed6c9779a1deab5abcf22cc54bb97bc58
+  metadata.gz: 54829c262a7ebcc4f610e60677db92468afdc9ef8d0f96a40b25146586182906
+  data.tar.gz: a9aef297aa9089a01dec3dfba63b06eebd9ea8465f724fab13c2abb3c725f560
 SHA512:
-  metadata.gz: 0eb24c92c82d33345308c66f430ffce14cad8fc841c212c9f9927f13c3273c9d66eff66f9dffe25ca7aad43e26a10b5cedda1fef1572b45ac23875490497e03c
-  data.tar.gz: 829f7596fda69391400a2166256632c2e4b5516cf6b07ae445a7c7eb49c24c90e8df80cc9558424b2dc9d3e6f36a33fc0e2abb56eb82be89fac18f262dd17a30
+  metadata.gz: 0dc83172b86117389996574cfbd7a351b9dfb195037ee1727ec2510954daddb7970904ea2798d00632844041fecd611f1e1697a0d21b2a147a69300071f90953
+  data.tar.gz: 89e35595ec63f7005ce4427622171d657785c9092001db88d0807214566b3f05a5b9dcb32a04e722fb4cabd81ce5b882eeeca9de141265a65b8d738837bcc819

data/lib/dry-stack/command_swarm_deploy.rb

@@ -9,31 +9,33 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     _params = stack.options.merge params
     stack.name = _params[:name] if _params[:name]
 
-    if params[:context_endpoint]
-      name = params[:context_endpoint].gsub( /[\/.:@]/,'_').gsub( '__','_')
-      name = "dry-#{name}".to_sym
-      endpoint = params[:context_endpoint]
-      contexts = {}
-      exec_o_lines 'docker context ls --format json' do |line|
-        ctx = JSON.parse line, symbolize_names: true
-        contexts[ctx[:Name].to_sym] = ctx # {"Current":false,"Description":"","DockerEndpoint":"ssh://root@x.x.x.x","Error":"","Name":"prod-swarm"}
-      end
-
-      if contexts[name] && contexts[name][:DockerEndpoint] != endpoint
-        raise "context '#{name}' has different host value: #{contexts[name][:DockerEndpoint]} != #{endpoint}"
-      end
-
-      exec_i "docker context create #{name} --docker host=#{endpoint}" unless contexts[name]
-
-      ENV['DOCKER_CONTEXT'] = name.to_s
+    raise 'Context endpoint required' unless params[:context_endpoint]
+
+    name = params[:context_endpoint].gsub( /[\/.:@]/,'_').gsub( '__','_')
+    name = "dry-#{name}".to_sym
+    endpoint = params[:context_endpoint]
+    $stdout.puts "Looking for docker context '#{name}'"
+
+    contexts = {}
+    exec_o_lines 'docker context ls --format json' do |line|
+      ctx = JSON.parse line, symbolize_names: true
+      contexts[ctx[:Name].to_sym] = ctx # {"Current":false,"Description":"","DockerEndpoint":"ssh://root@x.x.x.x","Error":"","Name":"prod-swarm"}
+    end
+
+    if contexts[name] && contexts[name][:DockerEndpoint] != endpoint
+      raise "context '#{name}' has different host value: #{contexts[name][:DockerEndpoint]} != #{endpoint}"
     end
 
+    exec_i "docker context create #{name} --docker host=#{endpoint}" unless contexts[name]
+
+    ENV['DOCKER_CONTEXT'] = name.to_s
+
     # substitute ENV variables
     yaml = stack.to_compose(_params).lines[1..].join
     # system " echo \"#{yaml.gsub("`", '\\\`')}\" | docker stack deploy -c - #{stack.name} --prune --resolve-image changed"
 
     #  --prune  --resolve-image changed
-    exec_i "docker stack deploy -c - #{stack.name} #{extra}", yaml
+    exec_i "docker stack deploy -c - --with-registry-auth #{extra}" #{stack.name} , yaml
     system "docker config rm $(docker config ls --filter label=com.docker.stack.namespace=#{stack.name} --format \"{{.ID}}\")"
 
     exec_i "docker config rm #{stack.name}_readme || echo 'failed to remove config #{stack.name}_readme'"

data/lib/dry-stack/stack.rb

@@ -15,6 +15,7 @@ require_relative 'apache_specific_md5'
 
 module Dry
   EMPTY_HASH = :empty_hash
+  DEFAULT_INIT_SERVICE = true # add "init: true" option
 
   class ::Hash
     def deep_merge!(second)
@@ -205,23 +206,26 @@ module Dry
             rule << "PathPrefix(`#{nginx_host2regexp ing[:path]}`)" if ing[:path]
             rule << "#{ing[:rule]}" if ing[:rule]
 
+            middlewares = []
+
             if ing[:basic_auth]
               ba_user, ba_password, salt = ing[:basic_auth].split ':'
               hashed_password = apr1_crypt ba_password, (salt || rand(36**8).to_s(36))
               service[:deploy][:labels] << "traefik.http.middlewares.#{service_name}-#{index}_auth.basicauth.users=#{ba_user}:#{hashed_password.gsub('$','$$')}"
-              service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.middlewares=#{service_name}-#{index}_auth"
+              middlewares << "#{service_name}-#{index}_auth"
             end
 
-
             service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.rule=#{rule.join ' && '}"
 
             if ing[:path_sub]
+              middlewares << "#{service_name}-#{index}-path_sub"
               service[:deploy][:labels] += [
-                "traefik.http.routers.#{service_name}-#{index}.middlewares=#{service_name}-#{index}-path_sub",
                 "traefik.http.middlewares.#{service_name}-#{index}-path_sub.replacepathregex.regex=#{ing[:path_sub][0]}",
                 "traefik.http.middlewares.#{service_name}-#{index}-path_sub.replacepathregex.replacement=#{ing[:path_sub][1].gsub('$','$$')}"
               ]
             end
+
+            service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.middlewares=#{middlewares.join ","}" unless middlewares.empty?
           end
         end
         service.delete :ingress
@@ -381,7 +385,11 @@ module Dry
       opts[:ports] = [opts[:ports]].flatten if opts.key? :ports
       opts[:environment] = opts.delete(:env) if opts.key? :env
 
-      service = @services[name.to_sym] ||= {environment: {}, deploy: {labels: []}, networks: {}}
+      service = @services[name.to_sym] ||= begin
+        s = {environment: {}, deploy: {labels: []}, networks: {}}
+        DEFAULT_INIT_SERVICE ? s.merge(init: true) : s
+      end
+
       service.deep_merge! opts
       ServiceFunction.new(service, &) if block_given?
     end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.16'
+    VERSION = '0.1.18'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake