kamal 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd7c6e6e18ca7cc95712642dfdb5ec45c33e06b6a02750e5ee7a3f1ac3428ea2
-  data.tar.gz: 1a8acfe5ec44636827ca70da1263289e6082359c58601acce9870d1d46ba750b
+  metadata.gz: 2e202f2e473f8a69d65631a19fa06631927aea76463158b02652f76ad05d927e
+  data.tar.gz: 485084a59d60985fb25a19ad3b8bfb53498e3af04b657366637aa73061dd6857
 SHA512:
-  metadata.gz: d1fb62392ddafc5b1fe6b54055121654bd73625eaf9808848ed60d7d40fdadf2938675b0bc881fca1297ee089f78b3768eefb96f5c10e9e8346265f20d9663e2
-  data.tar.gz: 6fc4f87a3ea64ebdee5c3c666cdafa5b15a0f7b243f575b402d82a2c8eec5b3802a05c0b5a80f6856eb92c24647b65a7bbdb8a68fd208dc873f1cd55d725894e
+  metadata.gz: c8d1f1663c8a338950d40f64e1364d33f00ee7b2a6c4f244fde4d9fba5c3513274fcf344a4498e34adb72c4b139b33cc8d8a58ca15a05a551d59e26498092227
+  data.tar.gz: fd1b593b23a88bec6f7cfedd98222b5fda0cae9bb57132cd043bbacd3f4c8d1221f795b5a0eb5dd1ba6aa5918a041a7978322c35a9f42a22008c9b1378c51393

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

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
@@ -93,12 +83,8 @@ class Kamal::Cli::App < Kamal::Cli::Base
   desc "details", "Show details about app containers"
   def details
     quiet = options[:quiet]
-    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), quiet: quiet
-      end
+    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
 
@@ -145,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)), quiet: quiet
-          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
 
@@ -159,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)), quiet: quiet
-          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
@@ -186,21 +164,17 @@ class Kamal::Cli::App < Kamal::Cli::Base
     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}", 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
+      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
@@ -247,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)), quiet: quiet
-          rescue SSHKit::Command::Failed
-            puts_by_host host, "Nothing found", quiet: quiet
-          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
@@ -274,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
@@ -291,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
@@ -304,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
@@ -318,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
@@ -332,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
@@ -342,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
@@ -366,6 +314,10 @@ class Kamal::Cli::App < Kamal::Cli::Base
   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/healthcheck/poller.rb

@@ -1,7 +1,7 @@
 module Kamal::Cli::Healthcheck::Poller
   extend self
 
-  def wait_for_healthy(role, &block)
+  def wait_for_healthy(&block)
     attempt = 1
     timeout_at = Time.now + KAMAL.config.deploy_timeout
     readiness_delay = KAMAL.config.readiness_delay

data/lib/kamal/cli/proxy.rb

@@ -11,13 +11,13 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
       on(KAMAL.proxy_hosts) do |host|
         execute *KAMAL.registry.login
 
-        version = capture_with_info(*KAMAL.proxy.version).strip.presence
+        version = capture_with_info(*KAMAL.proxy(host).version).strip.presence
 
-        if version && Kamal::Utils.older_version?(version, Kamal::Configuration::Proxy::Boot::MINIMUM_VERSION)
-          raise "kamal-proxy version #{version} is too old, run `kamal proxy reboot` in order to update to at least #{Kamal::Configuration::Proxy::Boot::MINIMUM_VERSION}"
+        if version && Kamal::Utils.older_version?(version, Kamal::Configuration::Proxy::Run::MINIMUM_VERSION)
+          raise "kamal-proxy version #{version} is too old, run `kamal proxy reboot` in order to update to at least #{Kamal::Configuration::Proxy::Run::MINIMUM_VERSION}"
         end
-        execute *KAMAL.proxy.ensure_apps_config_directory
-        execute *KAMAL.proxy.start_or_run
+        execute *KAMAL.proxy(host).ensure_apps_config_directory
+        execute *KAMAL.proxy(host).start_or_run
       end
     end
   end
@@ -25,9 +25,9 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
   desc "boot_config <set|get|reset>", "Manage kamal-proxy boot configuration"
   option :publish, type: :boolean, default: true, desc: "Publish the proxy ports on the host"
   option :publish_host_ip, type: :string, repeatable: true, default: nil, desc: "Host IP address to bind HTTP/HTTPS traffic to. Defaults to all interfaces"
-  option :http_port, type: :numeric, default: Kamal::Configuration::Proxy::Boot::DEFAULT_HTTP_PORT, desc: "HTTP port to publish on the host"
-  option :https_port, type: :numeric, default: Kamal::Configuration::Proxy::Boot::DEFAULT_HTTPS_PORT, desc: "HTTPS port to publish on the host"
-  option :log_max_size, type: :string, default: Kamal::Configuration::Proxy::Boot::DEFAULT_LOG_MAX_SIZE, desc: "Max size of proxy logs"
+  option :http_port, type: :numeric, default: Kamal::Configuration::Proxy::Run::DEFAULT_HTTP_PORT, desc: "HTTP port to publish on the host"
+  option :https_port, type: :numeric, default: Kamal::Configuration::Proxy::Run::DEFAULT_HTTPS_PORT, desc: "HTTPS port to publish on the host"
+  option :log_max_size, type: :string, default: Kamal::Configuration::Proxy::Run::DEFAULT_LOG_MAX_SIZE, desc: "Max size of proxy logs"
   option :registry, type: :string, default: nil, desc: "Registry to use for the proxy image"
   option :repository, type: :string, default: nil, desc: "Repository for the proxy image"
   option :image_version, type: :string, default: nil, desc: "Version of the proxy to run"
@@ -35,6 +35,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
   option :debug, type: :boolean, default: false, desc: "Whether to run the proxy in debug mode"
   option :docker_options, type: :array, default: [], desc: "Docker options to pass to the proxy container", banner: "option=value option2=value2"
   def boot_config(subcommand)
+    say "The proxy boot_config command is deprecated - set the config in the deploy YAML at proxy/run instead", :yellow
     proxy_boot_config = KAMAL.config.proxy_boot
 
     case subcommand
@@ -58,42 +59,44 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
       run_command = "kamal-proxy run #{Kamal::Utils.optionize(run_command_options).join(" ")}" if run_command_options.any?
 
       on(KAMAL.proxy_hosts) do |host|
-        execute(*KAMAL.proxy.ensure_proxy_directory)
+        proxy = KAMAL.proxy(host)
+        execute(*proxy.ensure_proxy_directory)
         if boot_options != proxy_boot_config.default_boot_options
           upload! StringIO.new(boot_options.join(" ")), proxy_boot_config.options_file
         else
-          execute *KAMAL.proxy.reset_boot_options, raise_on_non_zero_exit: false
+          execute *proxy.reset_boot_options, raise_on_non_zero_exit: false
         end
 
         if image != proxy_boot_config.image_default
           upload! StringIO.new(image), proxy_boot_config.image_file
         else
-          execute *KAMAL.proxy.reset_image, raise_on_non_zero_exit: false
+          execute *proxy.reset_image, raise_on_non_zero_exit: false
         end
 
         if image_version
           upload! StringIO.new(image_version), proxy_boot_config.image_version_file
         else
-          execute *KAMAL.proxy.reset_image_version, raise_on_non_zero_exit: false
+          execute *proxy.reset_image_version, raise_on_non_zero_exit: false
         end
 
         if run_command
           upload! StringIO.new(run_command), proxy_boot_config.run_command_file
         else
-          execute *KAMAL.proxy.reset_run_command, raise_on_non_zero_exit: false
+          execute *proxy.reset_run_command, raise_on_non_zero_exit: false
         end
       end
     when "get"
 
       on(KAMAL.proxy_hosts) do |host|
-        puts "Host #{host}: #{capture_with_info(*KAMAL.proxy.boot_config)}"
+        puts "Host #{host}: #{capture_with_info(*KAMAL.proxy(host).boot_config)}"
       end
     when "reset"
       on(KAMAL.proxy_hosts) do |host|
-        execute *KAMAL.proxy.reset_boot_options, raise_on_non_zero_exit: false
-        execute *KAMAL.proxy.reset_image, raise_on_non_zero_exit: false
-        execute *KAMAL.proxy.reset_image_version, raise_on_non_zero_exit: false
-        execute *KAMAL.proxy.reset_run_command, raise_on_non_zero_exit: false
+        proxy = KAMAL.proxy(host)
+        execute *proxy.reset_boot_options, raise_on_non_zero_exit: false
+        execute *proxy.reset_image, raise_on_non_zero_exit: false
+        execute *proxy.reset_image_version, raise_on_non_zero_exit: false
+        execute *proxy.reset_run_command, raise_on_non_zero_exit: false
       end
     else
       raise ArgumentError, "Unknown boot_config subcommand #{subcommand}"
@@ -111,15 +114,16 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
           host_list = Array(hosts).join(",")
           run_hook "pre-proxy-reboot", hosts: host_list
           on(hosts) do |host|
+            proxy = KAMAL.proxy(host)
             execute *KAMAL.auditor.record("Rebooted proxy"), verbosity: :debug
             execute *KAMAL.registry.login
 
             "Stopping and removing kamal-proxy on #{host}, if running..."
-            execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
-            execute *KAMAL.proxy.remove_container
-            execute *KAMAL.proxy.ensure_apps_config_directory
+            execute *proxy.stop, raise_on_non_zero_exit: false
+            execute *proxy.remove_container
+            execute *proxy.ensure_apps_config_directory
 
-            execute *KAMAL.proxy.run
+            execute *proxy.run
           end
           run_hook "post-proxy-reboot", hosts: host_list
         end
@@ -140,16 +144,17 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
         say "Upgrading proxy on #{host_list}...", :magenta
         run_hook "pre-proxy-reboot", hosts: host_list
         on(hosts) do |host|
+          proxy = KAMAL.proxy(host)
           execute *KAMAL.auditor.record("Rebooted proxy"), verbosity: :debug
           execute *KAMAL.registry.login
 
           "Stopping and removing Traefik on #{host}, if running..."
-          execute *KAMAL.proxy.cleanup_traefik
+          execute *proxy.cleanup_traefik
 
           "Stopping and removing kamal-proxy on #{host}, if running..."
-          execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
-          execute *KAMAL.proxy.remove_container
-          execute *KAMAL.proxy.remove_image
+          execute *proxy.stop, raise_on_non_zero_exit: false
+          execute *proxy.remove_container
+          execute *proxy.remove_image
         end
 
         KAMAL.with_specific_hosts(hosts) do
@@ -172,7 +177,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
     with_lock do
       on(KAMAL.proxy_hosts) do |host|
         execute *KAMAL.auditor.record("Started proxy"), verbosity: :debug
-        execute *KAMAL.proxy.start
+        execute *KAMAL.proxy(host).start
       end
     end
   end
@@ -182,7 +187,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
     with_lock do
       on(KAMAL.proxy_hosts) do |host|
         execute *KAMAL.auditor.record("Stopped proxy"), verbosity: :debug
-        execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
+        execute *KAMAL.proxy(host).stop, raise_on_non_zero_exit: false
       end
     end
   end
@@ -198,7 +203,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
   desc "details", "Show details about proxy container from servers"
   def details
     quiet = options[:quiet]
-    on(KAMAL.proxy_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.proxy.info), type: "Proxy", quiet: quiet }
+    on(KAMAL.proxy_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.proxy(host).info), type: "Proxy", quiet: quiet }
   end
 
   desc "logs", "Show log lines from proxy on servers"
@@ -213,16 +218,17 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
 
     if options[:follow]
       run_locally do
+        proxy = KAMAL.proxy(KAMAL.primary_host)
         info "Following logs on #{KAMAL.primary_host}..."
-        info KAMAL.proxy.follow_logs(host: KAMAL.primary_host, timestamps: timestamps, grep: grep)
-        exec KAMAL.proxy.follow_logs(host: KAMAL.primary_host, timestamps: timestamps, grep: grep)
+        info proxy.follow_logs(host: KAMAL.primary_host, timestamps: timestamps, grep: grep)
+        exec proxy.follow_logs(host: KAMAL.primary_host, timestamps: timestamps, grep: grep)
       end
     else
       since = options[:since]
       lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
 
       on(KAMAL.proxy_hosts) do |host|
-        puts_by_host host, capture(*KAMAL.proxy.logs(timestamps: timestamps, since: since, lines: lines, grep: grep)), type: "Proxy"
+        puts_by_host host, capture(*KAMAL.proxy(host).logs(timestamps: timestamps, since: since, lines: lines, grep: grep)), type: "Proxy"
       end
     end
   end
@@ -245,7 +251,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
     with_lock do
       on(KAMAL.proxy_hosts) do
         execute *KAMAL.auditor.record("Removed proxy container"), verbosity: :debug
-        execute *KAMAL.proxy.remove_container
+        execute *KAMAL.proxy(host).remove_container
       end
     end
   end
@@ -255,7 +261,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
     with_lock do
       on(KAMAL.proxy_hosts) do
         execute *KAMAL.auditor.record("Removed proxy image"), verbosity: :debug
-        execute *KAMAL.proxy.remove_image
+        execute *KAMAL.proxy(host).remove_image
       end
     end
   end
@@ -264,7 +270,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
   def remove_proxy_directory
     with_lock do
       on(KAMAL.proxy_hosts) do
-        execute *KAMAL.proxy.remove_proxy_directory, raise_on_non_zero_exit: false
+        execute *KAMAL.proxy(host).remove_proxy_directory, raise_on_non_zero_exit: false
       end
     end
   end

data/lib/kamal/cli/secrets.rb

@@ -12,8 +12,9 @@ class Kamal::Cli::Secrets < Kamal::Cli::Base
     end
 
     results = adapter.fetch(secrets, **options.slice(:account, :from).symbolize_keys)
+    json = JSON.dump(results)
 
-    return_or_puts JSON.dump(results).shellescape, inline: options[:inline]
+    return_or_puts options[:inline] ? json.shellescape : json, inline: options[:inline]
   end
 
   desc "extract", "Extract a single secret from the results of a fetch call"

data/lib/kamal/commander.rb

@@ -109,8 +109,8 @@ class Kamal::Commander
     @commands[:lock] ||= Kamal::Commands::Lock.new(config)
   end
 
-  def proxy
-    @commands[:proxy] ||= Kamal::Commands::Proxy.new(config)
+  def proxy(host)
+    Kamal::Commands::Proxy.new(config, host: host)
   end
 
   def prune

data/lib/kamal/commands/app.rb

@@ -23,7 +23,7 @@ class Kamal::Commands::App < Kamal::Commands::Base
       "--env", "KAMAL_CONTAINER_NAME=\"#{container_name}\"",
       "--env", "KAMAL_VERSION=\"#{config.version}\"",
       "--env", "KAMAL_HOST=\"#{host}\"",
-      "--env", "KAMAL_DESTINATION=\"#{config.destination}\"",
+      *([ "--env", "KAMAL_DESTINATION=\"#{config.destination}\"" ] if config.destination),
       *role.env_args(host),
       *role.logging_args,
       *config.volume_args,

data/lib/kamal/commands/proxy.rb

@@ -1,8 +1,27 @@
 class Kamal::Commands::Proxy < Kamal::Commands::Base
   delegate :argumentize, :optionize, to: Kamal::Utils
+  attr_reader :proxy_run_config
+
+  def initialize(config, host:)
+    super(config)
+    @proxy_run_config = config.proxy_run(host)
+  end
 
   def run
-    pipe boot_config, xargs(docker_run)
+    if proxy_run_config
+      docker \
+        :run,
+        "--name", container_name,
+        "--network", "kamal",
+        "--detach",
+        "--restart", "unless-stopped",
+        "--volume", "kamal-proxy-config:/home/kamal-proxy/.config/kamal-proxy",
+        *proxy_run_config.docker_options_args,
+        *proxy_run_config.image,
+        *proxy_run_config.run_command
+    else
+      pipe boot_config, xargs(docker_run)
+    end
   end
 
   def start
@@ -82,7 +101,7 @@ class Kamal::Commands::Proxy < Kamal::Commands::Base
   end
 
   def read_image_version
-    read_file(config.proxy_boot.image_version_file, default: Kamal::Configuration::Proxy::Boot::MINIMUM_VERSION)
+    read_file(config.proxy_boot.image_version_file, default: Kamal::Configuration::Proxy::Run::MINIMUM_VERSION)
   end
 
   def read_run_command