indocker 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d3472a334b23e6fc3ecf88306d9af0a9394a90aec769711492226322e96e2d6
-  data.tar.gz: '08150afcc26f9f053290d6abb1160a2a32405fa08d1cb2740b4839f3298f8e74'
+  metadata.gz: 94c3e1673cb76f0e0684e0d88286d7e9797e0d5095cc8d1da23c43c729c80df4
+  data.tar.gz: c2ee0ea5f6e461fb3efeeeb5b3f9415e701c7bffcadc754fae8356a88dcdd7ac
 SHA512:
-  metadata.gz: a3eeff429884e4f1961e725c97997b9c8c58874c7bb5ba31164e18cc6bc80e0169f82ceb01855dbaed098888397cf94f773c177b3aed4fe72091edfee2b969a5
-  data.tar.gz: 14480618981749a870f6acadb503d2cb9cbc08652d55a098c40801bbdcf3e01639d593cb100537c9399ed3df434a59740cf45ca9322939134982a78f0cf2c247
+  metadata.gz: ea87d5271a5bce0ff19bb28145ac31e6ab681278e008e43ebbba057fd8325bd358f02b83b46b1ba762653cbb6ed1b6565ce4e7ef72961149270fea3073e5d960
+  data.tar.gz: 2a18463fbb82df02122ec3b842f3a186dd08d50a946b5f999850c7f677ee305292a09cd9e95f54d1ca51ccaed21ac69edd25f56c3b5dde9f9de2a10d599b5319

data/Gemfile.lock

@@ -1,38 +1,38 @@
 PATH
   remote: .
   specs:
-    indocker (0.3.6)
+    indocker (0.3.9)
       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

@@ -26,9 +26,7 @@ class Indocker::ContainerDeployer
         end
       else
         Proc.new do |&block|
-          Thread.new do
-            block.call
-          end
+          block.call
         end
       end
 
@@ -44,9 +42,9 @@ class Indocker::ContainerDeployer
           )
 
         if result.exit_code != 0
-          exit 1 
+          exit 1
         end
-        
+
         @logger.info("Container deployment to #{server.user}@#{server.host} finished: #{container.name.to_s.green}")
 
         deploy_server.close_session

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.7"
+  VERSION = "0.3.9"
 end

metadata

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