indocker 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 738373105e7204366594f9789bc989e5c83453bc209fe0053485ef239156cc7a
-  data.tar.gz: 63dc5708eee2e75caab7a4bfaa8ac9c0e80c73fb46fbca987215d28309f07d86
+  metadata.gz: 70bf1241f0783dede869906f9f359c2a2137778a3059acaea9ae2fc7db30bb38
+  data.tar.gz: f4d906fc4ae36b9bf4482c7e5802c03b4a8633c7f839a0ffb71bbfc1571a5e30
 SHA512:
-  metadata.gz: 477f6ae6ffd9fa9087743f06e354d751af669e803c4f9f5a7ee74c820bbfb5872674c379a0a006d46200f5fe174bf7f1779b088df093b6dfeabe51c2fcd3e7b9
-  data.tar.gz: 355bee8644ae9e6e478cc878f41ee26c3f73bcf31c951561dc80fdc2c4bdde162e1d3d0bd387633d74501767c2b089a3f7cb20610795c5a6d2808a2b61dd079f
+  metadata.gz: d45a4d6ab954e10b76fbaf2b4ca098c1368fd6b6365756f24bb210757d5f221d0fcfcf5b11b378cc5e31de38d72967158c90d91aaa3c9df53334f8a2596f12f0
+  data.tar.gz: a0ae86f49931e812d34761ff20f73f704a010b742edb1968dae8e70fc7798edbd75cab519f34632d8f6840ab0b87f5454c70773c50627ac10fc5693e263819cb

data/Gemfile.lock

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

data/lib/indocker/launchers/configuration_deployer.rb

@@ -1,9 +1,7 @@
-require 'timeout'
 require 'benchmark'
 require 'tempfile'
 
 class Indocker::Launchers::ConfigurationDeployer
-  REMOTE_OPERATION_TIMEOUT = 60
 
   def initialize(logger:, global_logger:)
     Thread.abort_on_exception = true # abort all threads if exception occurs
@@ -107,12 +105,8 @@ class Indocker::Launchers::ConfigurationDeployer
 
   def wait_remote_operations(remote_operations)
     remote_operations.each do |remote_operation|
-      begin
-        Timeout::timeout(REMOTE_OPERATION_TIMEOUT) do
-          remote_operation.thread.join
-        end
-      rescue Timeout::Error
-        @global_logger.error("Deployment aborted. Remote operation :#{remote_operation.operation} on server #{remote_operation.server.user}@#{remote_operation.server.host} did not finish during #{REMOTE_OPERATION_TIMEOUT} seconds.")
+      if remote_operation.thread.join(Indocker.remote_operation_timeout).nil?
+        @global_logger.error("Deployment aborted. Remote operation :#{remote_operation.operation} on server #{remote_operation.server.user}@#{remote_operation.server.host} did not finish during #{Indocker.remote_operation_timeout} seconds.")
         exit 1
       end
     end
@@ -460,11 +454,13 @@ class Indocker::Launchers::ConfigurationDeployer
 
     @logger.info("Updating crontab file #{deploy_user}:#{crontab_filepath}")
 
-    Indocker::Shell.command("scp #{tmp_crontab_file.path} #{deploy_user}:#{crontab_filepath}", @logger)
+    ssh_options = "-o BatchMode=yes -o ConnectTimeout=#{Indocker.ssh_connect_timeout}"
+
+    Indocker::Shell.command("scp #{ssh_options} #{tmp_crontab_file.path} #{deploy_user}:#{crontab_filepath}", @logger)
 
     tmp_crontab_file.unlink
 
-    Indocker::Shell.command("ssh #{deploy_user} 'crontab #{crontab_filepath}'", @logger)
+    Indocker::Shell.command("ssh #{ssh_options} #{deploy_user} 'crontab #{crontab_filepath}'", @logger)
   end
 
   def sync_indocker(servers)

data/lib/indocker/rsync.rb

@@ -29,7 +29,20 @@ class Indocker::Rsync
         sync_local_cp(from, to, raise_on_error: raise_on_error)
       end
     else
-      command = "rsync --delete-after -a -e 'ssh -p #{session.port}' #{from} #{session.user}@#{session.host}:#{to}"
+      # BatchMode/ConnectTimeout: an unreachable server must fail in seconds with
+      # a clear rsync error instead of hanging silently (or prompting for a password)
+      # until the deployment-wide remote operation timeout kills the whole deploy.
+      # ServerAlive*: a path that accepts the connection and then stops delivering
+      # packets (seen when a cloud NAT address half-works) would otherwise hang
+      # just as long — keepalives tear such a session down in ~30s.
+      ssh_command = [
+        "ssh -p #{session.port}",
+        "-o BatchMode=yes",
+        "-o ConnectTimeout=#{Indocker.ssh_connect_timeout}",
+        "-o ServerAliveInterval=10",
+        "-o ServerAliveCountMax=3",
+      ].join(' ')
+      command = "rsync --delete-after -a -e '#{ssh_command}' #{from} #{session.user}@#{session.host}:#{to}"
       Indocker.logger.debug("sync #{from} #{session.user}@#{session.host}:#{to}")
       Indocker::Shell.command(command, Indocker.logger, raise_on_error: raise_on_error)
     end

data/lib/indocker/ssh_session.rb

@@ -29,7 +29,14 @@ class Indocker::SshSession
 
     if host != LOCALHOST
       require 'net/ssh'
-      @ssh = Net::SSH.start(@host, @user, {port: @port})
+      @ssh = Net::SSH.start(@host, @user, {
+        port:               @port,
+        non_interactive:    true,
+        timeout:            Indocker.ssh_connect_timeout,
+        keepalive:          true,
+        keepalive_interval: 10,
+        keepalive_maxcount: 3,
+      })
     end
   end
 

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/lib/indocker.rb

@@ -135,6 +135,22 @@ module Indocker
       @redeploy_crontab_path = val
     end
 
+    def set_remote_operation_timeout(seconds)
+      @remote_operation_timeout = seconds
+    end
+
+    def remote_operation_timeout
+      @remote_operation_timeout || 300
+    end
+
+    def set_ssh_connect_timeout(seconds)
+      @ssh_connect_timeout = seconds
+    end
+
+    def ssh_connect_timeout
+      @ssh_connect_timeout || 15
+    end
+
     def redeploy_crontab_path
       @redeploy_crontab_path
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ruslan Gatiyatov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2026-07-07 00:00:00.000000000 Z
+date: 2026-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh