dry-stack 0.0.67 → 0.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b25f53e89f787deef0a2dbb32f120cc18a66cc085fb33dabe4f95ef21a02cf1
-  data.tar.gz: 39d17808bc44fb83bc6c14c44391b5257de6b0cc961ba76da041964b4b0c31ef
+  metadata.gz: 146c4a166dd6b6136a2b3f9c4068bcdf01fa38f64665148523bb7e4192d91cc7
+  data.tar.gz: 27e180472c79e5b351d51086c5595b8d5326d67bf18b0b1661d849ab9315be0e
 SHA512:
-  metadata.gz: cb7bbe27f18757b7e57185ecdfd5eb23cc49810923fd702f1e277cbf383933df87ace982480687938db5934efcc3082e35b97e3c621f09fa42cd36c5532dd440
-  data.tar.gz: af89e3f72df4bd5ebc54f4ed54328298699a2dc86096f3a0ec1ae86e593a11ec822b452348a3d9115845db2cba9e2d2b0ac7a8f10f1ac57f3ca1aa64e112f263
+  metadata.gz: 74afa47a72fe82c508baedd4feaf3e8280f6890c540161f1fc87a3a2787d0330f6d3d05e8bc37ad5152a16243d485d477488969c37119b140cdfa6bb3a9c98a5
+  data.tar.gz: cb99fb3f874fbd03c04b9c8cef3a28ca660f60c65304e0c2977485a85f6af140a700a12d7430de0f10400aaa54dbbade3c1fa0dbd6460976328f56bf5c034da7

data/bin/stack.drs

@@ -2,6 +2,13 @@ Description <<~DSC
 
 DSC
 
+Options name: 'stack_name'
+SwarmDeploy :sky_gates do
+  context_host 'ssh://root@10.0.0.1'
+  stack_name 'remote_stack'
+  env REGISTRY_HOST: '10.100.0.2:5000'
+end
+
 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/command_compose.rb

@@ -1,7 +1,8 @@
 require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:to_compose] = Class.new do
-  def run(stack, params)
+  def run(stack, params, args)
+    raise "unsupported args: #{args}" unless args.empty?
     _params = stack.options.merge params
     stack.name = _params[:name] if _params[:name]
     yaml = stack.to_compose(_params).lines[1..].join

data/lib/dry-stack/command_line.rb

@@ -14,6 +14,14 @@ def exec_i(cmd, input_string = nil)
   end
 end
 
+def exec_o_lines(cmd,&)
+  IO.popen(cmd, 'r') do |f|
+    f.each_line do |line|
+      yield line
+    end
+  end
+end
+
 module Dry
   module CommandLine
     COMMANDS = {}
@@ -74,7 +82,7 @@ module Dry
           safe_eval stack_text # isolate context
 
           Stack.last_stack.name = params[:name] if params[:name]
-          COMMANDS[command.to_sym].run Stack.last_stack, params
+          COMMANDS[command.to_sym].run Stack.last_stack, params, args
         rescue => e
           puts e.message
           ENV['DEBUG'] ? raise : exit(1)

data/lib/dry-stack/command_swarm_deploy.rb

@@ -1,12 +1,38 @@
 require_relative 'command_line'
 
 Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
-  def run(stack, params)
+  def run(stack, params, args)
+    unless args.empty?
+      raise "deploy config not found: #{args[0]}" unless stack.swarm_deploy.key? args[0].to_sym
+      context = stack.swarm_deploy[args[0].to_sym]
+    end
     _params = stack.options.merge params
     stack.name = _params[:name] if _params[:name]
-    yaml = stack.to_compose(_params).lines[1..].join
+
+    if context
+      name = context[:context_name]&.to_sym || args[0].to_sym
+      host = context[:context_host]
+      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] != host
+        raise "context '#{name}' has different host value: #{contexts[name][:DockerEndpoint]} != #{host}"
+      end
+
+      exec_i "docker context create #{name} --docker host=#{host}" unless contexts[name]
+
+      ENV['DOCKER_CONTEXT'] = name.to_s
+      stack.name = context[:stack_name] || stack.name
+      context[:stack_name][:environment].each do |k,v|
+        ENV[k.to_s] = v.to_s
+      end
+    end
 
     # substitute ENV variables
+    yaml = stack.to_compose(_params).lines[1..].join
     yaml = _params[:'no-env'] ? yaml : `echo \"#{yaml.gsub("`", '\\\`')}\"`
     system " echo \"#{yaml.gsub("`", '\\\`')}\"" if _params[:v]
     # system " echo \"#{yaml.gsub("`", '\\\`')}\" | docker stack deploy -c - #{stack.name} --prune --resolve-image changed"
@@ -14,7 +40,7 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     exec_i "docker stack deploy -c - #{stack.name} --prune  --resolve-image changed", 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'"
+    exec_i "docker config rm #{stack.name}_readme || echo 'failed to remove config #{stack.name}_readme'"
     puts "stack description: #{stack.description}"
     exec_i "docker config create #{stack.name}_readme -", stack.description
   end

data/lib/dry-stack/stack.rb

@@ -42,12 +42,20 @@ module Dry
     def network(names) = (@service[:networks] ||= []) << names
   end
 
+  class SwarmFunction
+    def initialize(swarm, &); @swarm = swarm; instance_exec(&) end
+    def env(variables)= @swarm[:environment].merge! variables
+    def context_host(host)= @swarm[:context_host] = host
+    def context_name(name)= @swarm[:context_name] = name
+    def stack_name(name)= @swarm[:stack_name] = name
+  end
+
   class Stack
     COMPOSE_VERSION = '3.8'
     class << self
       attr_accessor :last_stack
     end
-    attr_accessor :name, :options, :description
+    attr_accessor :name, :options, :description, :swarm_deploy
 
     def Stack(name = nil, &)
       Stack.last_stack = Stack.new name
@@ -69,6 +77,7 @@ module Dry
       @labels = {}
       @configs = {}
       @logging = {}
+      @swarm_deploy = {}
     end
 
     def expand_hash(hash)
@@ -235,9 +244,9 @@ module Dry
       opts[:ports] = [opts[:ports]].flatten if opts.key? :ports
       opts[:environment] = opts.delete(:env) if opts.key? :env
 
-      @services[name] ||= {environment: {}, deploy: {labels: []}}
-      @services[name].merge! opts
-      ServiceFunction.new(@services[name], &)  if block_given?
+      service = @services[name.to_sym] ||= {environment: {}, deploy: {labels: []}}
+      service.merge! opts
+      ServiceFunction.new(service, &)  if block_given?
     end
 
     def Description(string)
@@ -299,6 +308,15 @@ module Dry
       @volumes[name].merge! opts
       yield if block_given?
     end
+
+    def SwarmDeploy(name, opts = {}, &)
+      opts[:environment] = opts.delete(:env) if opts.key? :env
+
+      swarm = @swarm_deploy[name.to_sym] ||= { environment: {} }
+      swarm.merge! opts
+      SwarmFunction.new(swarm, &) if block_given?
+    end
+
   end
 end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.67'
+    VERSION = '0.0.68'
   end
 end

metadata

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