indocker 0.3.9 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94c3e1673cb76f0e0684e0d88286d7e9797e0d5095cc8d1da23c43c729c80df4
-  data.tar.gz: c2ee0ea5f6e461fb3efeeeb5b3f9415e701c7bffcadc754fae8356a88dcdd7ac
+  metadata.gz: 90d16fd262c9576fcdd7e9f442bd6706533b37c195a8c95f991dd6ac4d7daf0a
+  data.tar.gz: 9a4d6fb758745112611f62879a6c8409bc8f2f3bfc9355b83b8022e3951ec111
 SHA512:
-  metadata.gz: ea87d5271a5bce0ff19bb28145ac31e6ab681278e008e43ebbba057fd8325bd358f02b83b46b1ba762653cbb6ed1b6565ce4e7ef72961149270fea3073e5d960
-  data.tar.gz: 2a18463fbb82df02122ec3b842f3a186dd08d50a946b5f999850c7f677ee305292a09cd9e95f54d1ca51ccaed21ac69edd25f56c3b5dde9f9de2a10d599b5319
+  metadata.gz: 12faa98ac4b95b8f9d7dbfad174a8fc797082c320eeff858bedfad1f136fd60024f9800915fb9e725c55717565833f6c36b83666ccace129a83ef1fb9e631791
+  data.tar.gz: ae35e8ca9212ebb76c63dd43348aa1fe20cbd462809e54660c20f693a0bcb4201d01b57bf68941c597c396ad68a2532e5fe0a2ac3077bd3d5578e9db1798a6e0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    indocker (0.3.9)
+    indocker (0.4.1)
       net-ssh
 
 GEM

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/docker.rb

@@ -20,7 +20,7 @@ class Indocker::Docker
 
     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)
+      Indocker::Shell.command("docker stop -t #{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.9"
+  VERSION = "0.4.1"
 end

metadata

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