kamal 2.7.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e1cf57d731a8b129a8ccbb86faddd3e813bc4d17895e6e538fe904f5bb65d27
-  data.tar.gz: 2d7d81b3a34f42fb427bfed18f9cf0ed1955d38e4b4783c1407bc1db6de5cef6
+  metadata.gz: c8f7525b3ed804be2810d0af353c254b8c7ebf4d5cf5916dbfa97d5bf4615d54
+  data.tar.gz: adfac172b3e4b45bc00092317bde87395fcedecf107b30c8500ab58097ef22d8
 SHA512:
-  metadata.gz: f3144c40082cfa24c78e2a1ebf2f433e491be3f5966e45cfc5488c3a11f5a3f513f097f7818cbc9e34d20b79986e64212055a87030fd4aa386a1d82bbb7d0efe
-  data.tar.gz: c6b796497a6f7a68815d340664b34fb9943f55ea7121122994aa3fdadaa5b12a18fb4078ff194cffb6060917a74611fdf31017afa75f2515d94ec259e0809251
+  metadata.gz: 05150f9253685ce18dd910cf809a99e51449b7452536e6c3f39c8e37d5ce3db4806bd8e198ed3e29aa872523eb8937db5b58faee036619f8e5b43d1084eebffc
+  data.tar.gz: 47e77a8d347c44aff4326f9927a0933c0240b5bfdb90f1b623e85ecdad8ba48c0e3443d43cd062b265aa29e2dbd47d778499be39a079d3cb93d8856cb0388108

data/README.md

@@ -6,7 +6,7 @@ From bare metal to cloud VMs, deploy web apps anywhere with zero downtime. Kamal
 
 ## Contributing to the documentation
 
-Please help us improve Kamal's documentation on the [the basecamp/kamal-site repository](https://github.com/basecamp/kamal-site).
+Please help us improve Kamal's documentation on [the basecamp/kamal-site repository](https://github.com/basecamp/kamal-site).
 
 ## License
 

data/lib/kamal/cli/accessory.rb

@@ -45,12 +45,14 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
     with_lock do
       with_accessory(name) do |accessory, hosts|
         on(hosts) do
-          accessory.files.each do |(local, remote)|
+          accessory.files.each do |(local, config)|
+            remote = config[:host_path]
             accessory.ensure_local_file_present(local)
 
             execute *accessory.make_directory_for(remote)
             upload! local, remote
-            execute :chmod, "755", remote
+            execute :chmod, config[:mode], remote
+            execute :chown, config[:owner], remote if config[:owner]
           end
         end
       end
@@ -62,8 +64,10 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
     with_lock do
       with_accessory(name) do |accessory, hosts|
         on(hosts) do
-          accessory.directories.keys.each do |host_path|
-            execute *accessory.make_directory(host_path)
+          accessory.directories.each do |(local, config)|
+            execute *accessory.make_directory(local)
+            execute :chmod, config[:mode], local if config[:mode]
+            execute :chown, config[:owner], local if config[:owner]
           end
         end
       end
@@ -77,6 +81,7 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
         KAMAL.accessory_names.each { |accessory_name| reboot(accessory_name) }
       else
         prepare(name)
+        pull_image(name)
         stop(name)
         remove_container(name)
         boot(name, prepare: false)
@@ -127,12 +132,13 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
 
   desc "details [NAME]", "Show details about accessory on host (use NAME=all to show all accessories)"
   def details(name)
+    quiet = options[:quiet]
     if name == "all"
       KAMAL.accessory_names.each { |accessory_name| details(accessory_name) }
     else
       type = "Accessory #{name}"
       with_accessory(name) do |accessory, hosts|
-        on(hosts) { puts_by_host host, capture_with_info(*accessory.info), type: type }
+        on(hosts) { puts_by_host host, capture_with_info(*accessory.info), type: type, quiet: quiet }
       end
     end
   end
@@ -144,6 +150,8 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
     pre_connect_if_required
 
     cmd = Kamal::Utils.join_commands(cmd)
+    quiet = options[:quiet]
+
     with_accessory(name) do |accessory, hosts|
       case
       when options[:interactive] && options[:reuse]
@@ -159,7 +167,7 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
         say "Launching command from existing container...", :magenta
         on(hosts) do |host|
           execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on #{name} accessory"), verbosity: :debug
-          puts_by_host host, capture_with_info(*accessory.execute_in_existing_container(cmd))
+          puts_by_host host, capture_with_info(*accessory.execute_in_existing_container(cmd)), quiet: quiet
         end
 
       else
@@ -167,7 +175,7 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
         on(hosts) do |host|
           execute *KAMAL.registry.login
           execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on #{name} accessory"), verbosity: :debug
-          puts_by_host host, capture_with_info(*accessory.execute_in_new_container(cmd))
+          puts_by_host host, capture_with_info(*accessory.execute_in_new_container(cmd)), quiet: quiet
         end
       end
     end
@@ -203,6 +211,18 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
     end
   end
 
+  desc "pull_image [NAME]", "Pull accessory image on host", hide: true
+  def pull_image(name)
+    with_lock do
+      with_accessory(name) do |accessory, hosts|
+        on(hosts) do
+          execute *KAMAL.auditor.record("Pull #{name} accessory image"), verbosity: :debug
+          execute *accessory.pull_image
+        end
+      end
+    end
+  end
+
   desc "remove [NAME]", "Remove accessory container, image and data directory from host (use NAME=all to remove all accessories)"
   option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
   def remove(name)

data/lib/kamal/cli/alias/command.rb

@@ -1,8 +1,8 @@
 class Kamal::Cli::Alias::Command < Thor::DynamicCommand
   def run(instance, args = [])
-    if (_alias = KAMAL.config.aliases[name])
+    if (command = KAMAL.resolve_alias(name))
       KAMAL.reset
-      Kamal::Cli::Main.start(Shellwords.split(_alias.command) + ARGV[1..-1])
+      Kamal::Cli::Main.start(Shellwords.split(command) + ARGV[1..-1])
     else
       super
     end

data/lib/kamal/cli/app/boot.rb

@@ -56,7 +56,7 @@ class Kamal::Cli::App::Boot
         raise Kamal::Cli::BootError, "Failed to get endpoint for #{role} on #{host}, did the container boot?" if endpoint.empty?
         execute *app.deploy(target: endpoint)
       else
-        Kamal::Cli::Healthcheck::Poller.wait_for_healthy(pause_after_ready: true) { capture_with_info(*app.status(version: version)) }
+        Kamal::Cli::Healthcheck::Poller.wait_for_healthy { capture_with_info(*app.status(version: version)) }
       end
     rescue => e
       error "Failed to boot #{role} on #{host}"

data/lib/kamal/cli/app.rb

@@ -23,10 +23,8 @@ class Kamal::Cli::App < Kamal::Cli::Base
           host_list = Array(hosts).join(",")
           run_hook "pre-app-boot", hosts: host_list
 
-          on(hosts) do |host|
-            KAMAL.roles_on(host).each do |role|
-              Kamal::Cli::App::Boot.new(host, role, self, version, barrier).run
-            end
+          on_roles(KAMAL.roles, hosts: hosts, parallel: KAMAL.config.boot.parallel_roles) do |host, role|
+            Kamal::Cli::App::Boot.new(host, role, self, version, barrier).run
           end
 
           run_hook "post-app-boot", hosts: host_list
@@ -45,21 +43,17 @@ class Kamal::Cli::App < Kamal::Cli::Base
   desc "start", "Start existing app container on servers"
   def start
     with_lock do
-      on(KAMAL.app_hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          app = KAMAL.app(role: role, host: host)
-          execute *KAMAL.auditor.record("Started app version #{KAMAL.config.version}"), verbosity: :debug
-          execute *app.start, raise_on_non_zero_exit: false
+      on_roles(KAMAL.roles, hosts: KAMAL.app_hosts, parallel: KAMAL.config.boot.parallel_roles) do |host, role|
+        app = KAMAL.app(role: role, host: host)
+        execute *KAMAL.auditor.record("Started app version #{KAMAL.config.version}"), verbosity: :debug
+        execute *app.start, raise_on_non_zero_exit: false
 
-          if role.running_proxy?
-            version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
-            endpoint = capture_with_info(*app.container_id_for_version(version)).strip
-            raise Kamal::Cli::BootError, "Failed to get endpoint for #{role} on #{host}, did the container boot?" if endpoint.empty?
+        if role.running_proxy?
+          version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
+          endpoint = capture_with_info(*app.container_id_for_version(version)).strip
+          raise Kamal::Cli::BootError, "Failed to get endpoint for #{role} on #{host}, did the container boot?" if endpoint.empty?
 
-            execute *app.deploy(target: endpoint)
-          end
+          execute *app.deploy(target: endpoint)
         end
       end
     end
@@ -68,23 +62,19 @@ class Kamal::Cli::App < Kamal::Cli::Base
   desc "stop", "Stop app container on servers"
   def stop
     with_lock do
-      on(KAMAL.app_hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          app = KAMAL.app(role: role, host: host)
-          execute *KAMAL.auditor.record("Stopped app", role: role), verbosity: :debug
-
-          if role.running_proxy?
-            version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
-            endpoint = capture_with_info(*app.container_id_for_version(version)).strip
-            if endpoint.present?
-              execute *app.remove, raise_on_non_zero_exit: false
-            end
-          end
+      on_roles(KAMAL.roles, hosts: KAMAL.app_hosts, parallel: KAMAL.config.boot.parallel_roles) do |host, role|
+        app = KAMAL.app(role: role, host: host)
+        execute *KAMAL.auditor.record("Stopped app", role: role), verbosity: :debug
 
-          execute *app.stop, raise_on_non_zero_exit: false
+        if role.running_proxy?
+          version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
+          endpoint = capture_with_info(*app.container_id_for_version(version)).strip
+          if endpoint.present?
+            execute *app.remove, raise_on_non_zero_exit: false
+          end
         end
+
+        execute *app.stop, raise_on_non_zero_exit: false
       end
     end
   end
@@ -92,12 +82,9 @@ class Kamal::Cli::App < Kamal::Cli::Base
   # FIXME: Drop in favor of just containers?
   desc "details", "Show details about app containers"
   def details
-    on(KAMAL.app_hosts) do |host|
-      roles = KAMAL.roles_on(host)
-
-      roles.each do |role|
-        puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).info)
-      end
+    quiet = options[:quiet]
+    on_roles(KAMAL.roles, hosts: KAMAL.app_hosts) do |host, role|
+      puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).info), quiet: quiet
     end
   end
 
@@ -120,6 +107,7 @@ class Kamal::Cli::App < Kamal::Cli::Base
     cmd = Kamal::Utils.join_commands(cmd)
     env = options[:env]
     detach = options[:detach]
+    quiet = options[:quiet]
     case
     when options[:interactive] && options[:reuse]
       say "Get current version of running container...", :magenta unless options[:version]
@@ -143,13 +131,9 @@ class Kamal::Cli::App < Kamal::Cli::Base
       using_version(options[:version] || current_running_version) do |version|
         say "Launching command with version #{version} from existing container...", :magenta
 
-        on(KAMAL.app_hosts) do |host|
-          roles = KAMAL.roles_on(host)
-
-          roles.each do |role|
-            execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on app version #{version}", role: role), verbosity: :debug
-            puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).execute_in_existing_container(cmd, env: env))
-          end
+        on_roles(KAMAL.roles, hosts: KAMAL.app_hosts) do |host, role|
+          execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on app version #{version}", role: role), verbosity: :debug
+          puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).execute_in_existing_container(cmd, env: env)), quiet: quiet
         end
       end
 
@@ -157,15 +141,11 @@ class Kamal::Cli::App < Kamal::Cli::Base
       say "Get most recent version available as an image...", :magenta unless options[:version]
       using_version(version_or_latest) do |version|
         say "Launching command with version #{version} from new container...", :magenta
-        on(KAMAL.app_hosts) do |host|
-          execute *KAMAL.registry.login
-
-          roles = KAMAL.roles_on(host)
+        on(KAMAL.app_hosts) { execute *KAMAL.registry.login }
 
-          roles.each do |role|
-            execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on app version #{version}"), verbosity: :debug
-            puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).execute_in_new_container(cmd, env: env, detach: detach))
-          end
+        on_roles(KAMAL.roles, hosts: KAMAL.app_hosts) do |host, role|
+          execute *KAMAL.auditor.record("Executed cmd '#{cmd}' on app version #{version}"), verbosity: :debug
+          puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).execute_in_new_container(cmd, env: env, detach: detach)), quiet: quiet
         end
       end
     end
@@ -173,30 +153,28 @@ class Kamal::Cli::App < Kamal::Cli::Base
 
   desc "containers", "Show app containers on servers"
   def containers
-    on(KAMAL.app_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.app.list_containers) }
+    quiet = options[:quiet]
+    on(KAMAL.app_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.app.list_containers), quiet: quiet }
   end
 
   desc "stale_containers", "Detect app stale containers"
   option :stop, aliases: "-s", type: :boolean, default: false, desc: "Stop the stale containers found"
   def stale_containers
+    quiet = options[:quiet]
     stop = options[:stop]
 
     with_lock_if_stopping do
-      on(KAMAL.app_hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          app = KAMAL.app(role: role, host: host)
-          versions = capture_with_info(*app.list_versions, raise_on_non_zero_exit: false).split("\n")
-          versions -= [ capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip ]
-
-          versions.each do |version|
-            if stop
-              puts_by_host host, "Stopping stale container for role #{role} with version #{version}"
-              execute *app.stop(version: version), raise_on_non_zero_exit: false
-            else
-              puts_by_host host,  "Detected stale container for role #{role} with version #{version} (use `kamal app stale_containers --stop` to stop)"
-            end
+      on_roles(KAMAL.roles, hosts: KAMAL.app_hosts) do |host, role|
+        app = KAMAL.app(role: role, host: host)
+        versions = capture_with_info(*app.list_versions, raise_on_non_zero_exit: false).split("\n")
+        versions -= [ capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip ]
+
+        versions.each do |version|
+          if stop
+            puts_by_host host, "Stopping stale container for role #{role} with version #{version}", quiet: quiet
+            execute *app.stop(version: version), raise_on_non_zero_exit: false
+          else
+            puts_by_host host,  "Detected stale container for role #{role} with version #{version} (use `kamal app stale_containers --stop` to stop)", quiet: quiet
           end
         end
       end
@@ -205,7 +183,8 @@ class Kamal::Cli::App < Kamal::Cli::Base
 
   desc "images", "Show app images on servers"
   def images
-    on(KAMAL.app_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.app.list_images) }
+    quiet = options[:quiet]
+    on(KAMAL.app_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.app.list_images), quiet: quiet }
   end
 
   desc "logs", "Show log lines from app on servers (use --help to show options)"
@@ -224,6 +203,7 @@ class Kamal::Cli::App < Kamal::Cli::Base
     since = options[:since]
     container_id = options[:container_id]
     timestamps = !options[:skip_timestamps]
+    quiet = options[:quiet]
 
     if options[:follow]
       lines = options[:lines].presence || ((since || grep) ? nil : 10) # Default to 10 lines if since or grep isn't set
@@ -241,15 +221,11 @@ class Kamal::Cli::App < Kamal::Cli::Base
     else
       lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
 
-      on(KAMAL.app_hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          begin
-            puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).logs(container_id: container_id, timestamps: timestamps, since: since, lines: lines, grep: grep, grep_options: grep_options))
-          rescue SSHKit::Command::Failed
-            puts_by_host host, "Nothing found"
-          end
+      on_roles(KAMAL.roles, hosts: KAMAL.app_hosts) do |host, role|
+        begin
+          puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).logs(container_id: container_id, timestamps: timestamps, since: since, lines: lines, grep: grep, grep_options: grep_options)), quiet: quiet
+        rescue SSHKit::Command::Failed
+          puts_by_host host, "Nothing found", quiet: quiet
         end
       end
     end
@@ -268,12 +244,8 @@ class Kamal::Cli::App < Kamal::Cli::Base
   desc "live", "Set the app to live mode"
   def live
     with_lock do
-      on(KAMAL.proxy_hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          execute *KAMAL.app(role: role, host: host).live if role.running_proxy?
-        end
+      on_roles(KAMAL.roles, hosts: KAMAL.proxy_hosts) do |host, role|
+        execute *KAMAL.app(role: role, host: host).live if role.running_proxy?
       end
     end
   end
@@ -285,12 +257,8 @@ class Kamal::Cli::App < Kamal::Cli::Base
     maintenance_options = { drain_timeout: options[:drain_timeout] || KAMAL.config.drain_timeout, message: options[:message] }
 
     with_lock do
-      on(KAMAL.proxy_hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          execute *KAMAL.app(role: role, host: host).maintenance(**maintenance_options) if role.running_proxy?
-        end
+      on_roles(KAMAL.roles, hosts: KAMAL.proxy_hosts) do |host, role|
+        execute *KAMAL.app(role: role, host: host).maintenance(**maintenance_options) if role.running_proxy?
       end
     end
   end
@@ -298,13 +266,9 @@ class Kamal::Cli::App < Kamal::Cli::Base
   desc "remove_container [VERSION]", "Remove app container with given version from servers", hide: true
   def remove_container(version)
     with_lock do
-      on(KAMAL.app_hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          execute *KAMAL.auditor.record("Removed app container with version #{version}", role: role), verbosity: :debug
-          execute *KAMAL.app(role: role, host: host).remove_container(version: version)
-        end
+      on_roles(KAMAL.roles, hosts: KAMAL.app_hosts) do |host, role|
+        execute *KAMAL.auditor.record("Removed app container with version #{version}", role: role), verbosity: :debug
+        execute *KAMAL.app(role: role, host: host).remove_container(version: version)
       end
     end
   end
@@ -312,13 +276,9 @@ class Kamal::Cli::App < Kamal::Cli::Base
   desc "remove_containers", "Remove all app containers from servers", hide: true
   def remove_containers
     with_lock do
-      on(KAMAL.app_hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          execute *KAMAL.auditor.record("Removed all app containers", role: role), verbosity: :debug
-          execute *KAMAL.app(role: role, host: host).remove_containers
-        end
+      on_roles(KAMAL.roles, hosts: KAMAL.app_hosts) do |host, role|
+        execute *KAMAL.auditor.record("Removed all app containers", role: role), verbosity: :debug
+        execute *KAMAL.app(role: role, host: host).remove_containers
       end
     end
   end
@@ -326,7 +286,7 @@ class Kamal::Cli::App < Kamal::Cli::Base
   desc "remove_images", "Remove all app images from servers", hide: true
   def remove_images
     with_lock do
-      on(KAMAL.app_hosts) do
+      on(hosts_removing_all_roles) do
         execute *KAMAL.auditor.record("Removed all app images"), verbosity: :debug
         execute *KAMAL.app.remove_images
       end
@@ -336,14 +296,8 @@ class Kamal::Cli::App < Kamal::Cli::Base
   desc "remove_app_directories", "Remove the app directories from servers", hide: true
   def remove_app_directories
     with_lock do
-      on(KAMAL.app_hosts) do |host|
-        roles = KAMAL.roles_on(host)
-
-        roles.each do |role|
-          execute *KAMAL.auditor.record("Removed #{KAMAL.config.app_directory}", role: role), verbosity: :debug
-          execute *KAMAL.server.remove_app_directory, raise_on_non_zero_exit: false
-        end
-
+      on(hosts_removing_all_roles) do |host|
+        execute *KAMAL.server.remove_app_directory, raise_on_non_zero_exit: false
         execute *KAMAL.auditor.record("Removed #{KAMAL.config.app_directory}"), verbosity: :debug
         execute *KAMAL.app.remove_proxy_app_directory, raise_on_non_zero_exit: false
       end
@@ -352,13 +306,18 @@ class Kamal::Cli::App < Kamal::Cli::Base
 
   desc "version", "Show app version currently running on servers"
   def version
+    quiet = options[:quiet]
     on(KAMAL.app_hosts) do |host|
       role = KAMAL.roles_on(host).first
-      puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).current_running_version).strip
+      puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).current_running_version).strip, quiet: quiet
     end
   end
 
   private
+    def hosts_removing_all_roles
+      KAMAL.app_hosts.select { |host| KAMAL.roles_on(host).map(&:name).sort == KAMAL.config.host_roles(host.to_s).map(&:name).sort }
+    end
+
     def using_version(new_version)
       if new_version
         begin

data/lib/kamal/cli/base.rb

@@ -5,6 +5,8 @@ module Kamal::Cli
   class Base < Thor
     include SSHKit::DSL
 
+    VERBOSITY = { verbose: :debug, quiet: :error }.freeze
+
     def self.exit_on_failure?() true end
     def self.dynamic_command_class() Kamal::Cli::Alias::Command end
 
@@ -43,11 +45,11 @@ module Kamal::Cli
         KAMAL.tap do |commander|
           if options[:verbose]
             ENV["VERBOSE"] = "1" # For backtraces via cli/start
-            commander.verbosity = :debug
+            commander.verbosity = VERBOSITY[:verbose]
           end
 
           if options[:quiet]
-            commander.verbosity = :error
+            commander.verbosity = VERBOSITY[:quiet]
           end
 
           commander.configure \
@@ -141,10 +143,21 @@ module Kamal::Cli
             subcommand: subcommand
           }.compact
 
-          say "Running the #{hook} hook...", :magenta
+          hooks_output = KAMAL.config.hooks_output_for(hook)
+
+          # CLI flags override config: -q hides all, -v shows all
+          # Config setting :verbose forces output, :quiet forces silence
+          hook_verbosity = if KAMAL.verbosity == :info && hooks_output
+            VERBOSITY.fetch(hooks_output)
+          else
+            KAMAL.verbosity
+          end
+
           with_env KAMAL.hook.env(**details, **extra_details) do
-            run_locally do
-              execute *KAMAL.hook.run(hook)
+            KAMAL.with_verbosity(hook_verbosity) do
+              run_locally do
+                execute *KAMAL.hook.run(hook)
+              end
             end
           rescue SSHKit::Command::Failed => e
             raise HookError.new("Hook `#{hook}` failed:\n#{e.message}")
@@ -160,7 +173,7 @@ module Kamal::Cli
 
       def pre_connect_if_required
         if !KAMAL.connected?
-          run_hook "pre-connect"
+          run_hook "pre-connect", secrets: true unless options[:skip_hooks]
           KAMAL.connected = true
         end
       end

data/lib/kamal/cli/build/clone.rb

@@ -1,5 +1,3 @@
-require "uri"
-
 class Kamal::Cli::Build::Clone
   attr_reader :sshkit
   delegate :info, :error, :execute, :capture_with_info, to: :sshkit

data/lib/kamal/cli/build/port_forwarding.rb

@@ -0,0 +1,66 @@
+require "concurrent/atomic/count_down_latch"
+
+class Kamal::Cli::Build::PortForwarding
+  attr_reader :hosts, :port, :ssh_options
+
+  def initialize(hosts, port, **ssh_options)
+    @hosts = hosts
+    @port = port
+    @ssh_options = ssh_options
+  end
+
+  def forward
+    @done = false
+    forward_ports
+
+    yield
+  ensure
+    stop
+  end
+
+  private
+    def stop
+      @done = true
+      @threads.to_a.each(&:join)
+    end
+
+    def forward_ports
+      ready = Concurrent::CountDownLatch.new(hosts.size)
+
+      @threads = hosts.map do |host|
+        Thread.new do
+          begin
+            Net::SSH.start(host, ssh_options[:user], **ssh_options.except(:user)) do |ssh|
+              ssh.forward.remote(port, "localhost", port, "127.0.0.1") do |remote_port, bind_address|
+                if remote_port == :error
+                  raise "Failed to establish port forward on #{host}"
+                else
+                  ready.count_down
+                end
+              end
+
+              ssh.loop(0.1) do
+                if @done
+                  ssh.forward.cancel_remote(port, "127.0.0.1")
+                  break
+                else
+                  true
+                end
+              end
+            end
+          rescue Exception => e
+            error "Error setting up port forwarding to #{host}: #{e.class}: #{e.message}"
+            error e.backtrace.join("\n")
+
+            raise
+          end
+        end
+      end
+
+      raise "Timed out waiting for port forwarding to be established" unless ready.wait(30)
+    end
+
+    def error(message)
+      SSHKit.config.output.error(message)
+    end
+end