Merge branch 'basecamp:main' into buildpacks

lib/kamal/cli/app.rb

@@ -112,6 +112,10 @@ class Kamal::Cli::App < Kamal::Cli::Base
       raise ArgumentError, "Detach is not compatible with #{incompatible_options.join(" or ")}"
     end
 
+    if cmd.empty?
+      raise ArgumentError, "No command provided. You must specify a command to execute."
+    end
+
     cmd = Kamal::Utils.join_commands(cmd)
     env = options[:env]
     detach = options[:detach]

lib/kamal/cli/base.rb

@@ -133,7 +133,7 @@ module Kamal::Cli
 
       def run_hook(hook, **extra_details)
         if !options[:skip_hooks] && KAMAL.hook.hook_exists?(hook)
-          details = { hosts: KAMAL.hosts.join(","), command: command, subcommand: subcommand }
+          details = { hosts: KAMAL.hosts.join(","), roles: KAMAL.specific_roles&.join(","), command: command, subcommand: subcommand }.compact
 
           say "Running the #{hook} hook...", :magenta
           with_env KAMAL.hook.env(**details, **extra_details) do

lib/kamal/cli/proxy.rb

@@ -69,6 +69,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
         end
       end
     when "get"
+
       on(KAMAL.proxy_hosts) do |host|
         puts "Host #{host}: #{capture_with_info(*KAMAL.proxy.boot_config)}"
       end

lib/kamal/cli/templates/sample_hooks/pre-deploy.sample

@@ -82,11 +82,12 @@ end
 
 $stdout.sync = true
 
-puts "Checking build status..."
-attempts = 0
-checks = GithubStatusChecks.new
-
 begin
+  puts "Checking build status..."
+
+  attempts = 0
+  checks = GithubStatusChecks.new
+
   loop do
     case checks.state
     when "success"

lib/kamal/commands/builder/base.rb

@@ -21,7 +21,8 @@ class Kamal::Commands::Builder::Base < Kamal::Commands::Base
       *([ "--builder", builder_name ] unless docker_driver?),
       *build_tag_options(tag_as_dirty: tag_as_dirty),
       *build_options,
-      build_context
+      build_context,
+      "2>&1"
   end
 
   def pull