Merge branch 'main' into global-logging-config

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

lib/mrsk/configuration.rb

@@ -6,7 +6,7 @@ require "erb"
 require "net/ssh/proxy/jump"
 
 class Mrsk::Configuration
-  delegate :service, :image, :servers, :env, :labels, :registry, :builder, :logging, to: :raw_config, allow_nil: true
+  delegate :service, :image, :servers, :env, :labels, :registry, :builder, :stop_wait_time, to: :raw_config, allow_nil: true
   delegate :argumentize, :argumentize_env_with_secrets, :optionize, to: Mrsk::Utils
 
   attr_accessor :destination