indocker 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87639308a00d3b5ff25ea91c810684010020f5b3166d437a4cb9e13fbc0bdaaa
-  data.tar.gz: 67e2bccca67ce27dc8c9c2e22932aa6fc7787f78e1330dda2f9bc303f827c58e
+  metadata.gz: 2e66344870970bb12d0f6811219da96fe68d4549416280ac39cf3bd07960ff96
+  data.tar.gz: ff05089cd25b1aea14d84a052febae5436b002cedbb03d7490cc2659815a6846
 SHA512:
-  metadata.gz: 0e9c826e268274d3051c8a4ce11f3eb33b33d786821fb750ef8ccc0d651edf7b8dcc63147793b7324ef1aa7493df7341aa6769d08b17aa159aba8fa8d7299820
-  data.tar.gz: 125b92b07ab11799d228152eac7f61a9ce059344c65d2285bbf18457fdeb15e0ec15f2b45ecf1809870b86a6f192aa1c42b751bbedcbcf11f3aa950fe0e770b9
+  metadata.gz: 44a2d51ed48f473d5b5f65f81d681d188be17830487b1ff98ac63b252f99f5ca33686f262c41fc763f3f70e9244b31a1469615fae6b47f6f16b91b3632129eb3
+  data.tar.gz: d196b2da95b698b3b897c54a408526229978f69e29f9c6d297c4bda8234662ea633f6e493b7612cd218132b4aa96bdc97bcb4c057a591e270e4d35b1714f48d4

data/Gemfile.lock

@@ -1,38 +1,38 @@
 PATH
   remote: .
   specs:
-    indocker (0.3.8)
+    indocker (0.4.0)
       net-ssh
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.3)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    method_source (1.0.0)
-    net-ssh (7.2.0)
-    pry (0.14.2)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    method_source (1.1.0)
+    net-ssh (7.3.0)
+    pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rake (12.3.3)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
 
 PLATFORMS
   x86_64-linux

data/lib/indocker/container_deployer.rb

@@ -17,39 +17,25 @@ class Indocker::ContainerDeployer
   def deploy(container, force_restart, skip_force_restart, progress)
     return if @deployed_containers[container]
 
-    container.servers.each do |server|
+    # Deploy the same container to all of its servers in parallel.
+    #
+    # Each thread opens its OWN ssh connection (create_connection!), so no
+    # net-ssh session is shared between threads. We join all threads before
+    # returning, so container dependency ordering (depends_on) is preserved:
+    # a dependent container never starts deploying until every server of its
+    # dependency has finished.
+    threads = container.servers.map do |server|
       progress.start_deploying_container(container, server)
 
-      exec_proc = if !container.is_daemonized?
-        Proc.new do |&block|
-          block.call
-        end
-      else
-        Proc.new do |&block|
-          block.call
-        end
+      Thread.new do
+        deploy_to_server(container, server, force_restart, skip_force_restart, progress)
       end
+    end
 
-      exec_proc.call do
-        deploy_server = @server_pool.create_connection!(server)
-        @logger.info("Deploying container: #{container.name.to_s.green} to #{server.user}@#{server.host}")
-
-        result = deploy_server
-          .run_container_remotely(
-            configuration_name: Indocker.configuration_name,
-            container_name:     container.name,
-            force_restart:      force_restart && !skip_force_restart.include?(container.name)
-          )
-
-        if result.exit_code != 0
-          exit 1
-        end
-
-        @logger.info("Container deployment to #{server.user}@#{server.host} finished: #{container.name.to_s.green}")
+    results = threads.map(&:value)
 
-        deploy_server.close_session
-        progress.finish_deploying_container(container, server)
-      end
+    if results.any? { |exit_code| exit_code != 0 }
+      exit 1
     end
 
     @deployed_containers[container] = true
@@ -60,4 +46,31 @@ class Indocker::ContainerDeployer
   rescue => e
     @logger.error("error during closing sessions #{e.inspect}")
   end
+
+  private
+
+  # Runs a single container deployment on a single server. Returns the remote
+  # exit code (0 on success). Runs inside its own thread with a dedicated ssh
+  # connection, so it must not touch shared mutable state except the
+  # thread-safe `progress`.
+  def deploy_to_server(container, server, force_restart, skip_force_restart, progress)
+    deploy_server = @server_pool.create_connection!(server)
+    @logger.info("Deploying container: #{container.name.to_s.green} to #{server.user}@#{server.host}")
+
+    result = deploy_server
+      .run_container_remotely(
+        configuration_name: Indocker.configuration_name,
+        container_name:     container.name,
+        force_restart:      force_restart && !skip_force_restart.include?(container.name)
+      )
+
+    if result.exit_code == 0
+      @logger.info("Container deployment to #{server.user}@#{server.host} finished: #{container.name.to_s.green}")
+      progress.finish_deploying_container(container, server)
+    end
+
+    deploy_server.close_session
+
+    result.exit_code
+  end
 end

data/lib/indocker/deploy_context.rb

@@ -69,8 +69,10 @@ class Indocker::DeployContext
           container.before_start_proc.call(container, number)
         end
 
+        stop_timeout = container.get_start_option(:stop_timeout)
+
         if container_id
-          Indocker::Docker.stop(hostname, skip_errors: true)
+          Indocker::Docker.stop(hostname, time: stop_timeout, skip_errors: true)
         else
           Indocker::Docker.rm(hostname, skip_errors: true)
         end
@@ -97,4 +99,4 @@ class Indocker::DeployContext
 
     nil
   end
-end
+end

data/lib/indocker/docker.rb

@@ -18,7 +18,8 @@ class Indocker::Docker
       Indocker::Shell.command("docker pull #{url}", Indocker.logger)
     end
 
-    def stop(container_name, time = 10, skip_errors: false)
+    def stop(container_name, time: nil, skip_errors: false)
+      time ||= 10 # default timeout for Linux
       Indocker::Shell.command("docker stop --time=#{time} #{container_name}", Indocker.logger, skip_errors: skip_errors)
       rm(container_name, skip_errors: skip_errors)
     end

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.3.8"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-03 00:00:00.000000000 Z
+date: 2026-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh