Merge branch 'main' into global-logging-config

2023-03-24 15:32:41 +01:00
parent 4044abdde1 e2e5e18af9
commit b5ccc1fa5d
4 changed files with 18 additions and 2 deletions
--- a/lib/mrsk/commands/app.rb
+++ b/lib/mrsk/commands/app.rb
@@ -30,7 +30,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
  def stop(version: nil)
    pipe \
      version ? container_id_for_version(version) : current_container_id,
-      xargs(docker(:stop))
+      xargs(config.stop_wait_time ? docker(:stop, "-t", config.stop_wait_time) : docker(:stop))
  end

  def info