dash 3.2.0 → 3.2.1

data/lib/{kamal → dash}/cli/main.rb

@@ -1,4 +1,4 @@
-class Kamal::Cli::Main < Kamal::Cli::Base
+class Dash::Cli::Main < Dash::Cli::Base
   desc "setup", "Setup all accessories, push the env, and deploy app to servers"
   option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
   option :no_cache, type: :boolean, default: false, desc: "Build without using Docker's build cache"
@@ -8,7 +8,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
         invoke_options = deploy_options
 
         say "Ensure Docker is installed...", :magenta
-        invoke "kamal:cli:server:bootstrap", [], invoke_options
+        invoke "dash:cli:server:bootstrap", [], invoke_options
 
         deploy(boot_accessories: true)
       end
@@ -26,36 +26,36 @@ class Kamal::Cli::Main < Kamal::Cli::Base
         print_config_banner
 
         say "Validate configuration and secrets...", :magenta
-        KAMAL.config.validate_secrets!(include_accessories: boot_accessories)
+        DASH.config.validate_secrets!(include_accessories: boot_accessories)
 
         if options[:skip_push]
           say "Pull app image...", :magenta
-          invoke "kamal:cli:build:pull", [], invoke_options
+          invoke "dash:cli:build:pull", [], invoke_options
         else
           say "Build and push app image...", :magenta
-          invoke "kamal:cli:build:deliver", [], invoke_options
+          invoke "dash:cli:build:deliver", [], invoke_options
         end
 
         modify(lock: true) do
           run_hook "pre-deploy", secrets: true
 
           say "Ensure kamal-proxy is running...", :magenta
-          invoke "kamal:cli:proxy:boot", [], invoke_options
+          invoke "dash:cli:proxy:boot", [], invoke_options
 
-          invoke "kamal:cli:accessory:boot", [ "all" ], invoke_options if boot_accessories
+          invoke "dash:cli:accessory:boot", [ "all" ], invoke_options if boot_accessories
 
           say "Detect stale containers...", :magenta
-          invoke "kamal:cli:app:stale_containers", [], invoke_options.merge(stop: true)
+          invoke "dash:cli:app:stale_containers", [], invoke_options.merge(stop: true)
 
-          invoke "kamal:cli:app:boot", [], invoke_options
+          invoke "dash:cli:app:boot", [], invoke_options
 
-          if KAMAL.config.proxy.load_balancing?
+          if DASH.config.proxy.load_balancing?
             say "Updating loadbalancer configuration...", :magenta
-            invoke "kamal:cli:proxy:loadbalancer", [ "deploy" ], invoke_options
+            invoke "dash:cli:proxy:loadbalancer", [ "deploy" ], invoke_options
           end
 
           say "Prune old containers and images...", :magenta
-          invoke "kamal:cli:prune:all", [], invoke_options
+          invoke "dash:cli:prune:all", [], invoke_options
         end
       end
 
@@ -74,27 +74,27 @@ class Kamal::Cli::Main < Kamal::Cli::Base
         print_config_banner
 
         say "Validate configuration and secrets...", :magenta
-        KAMAL.config.validate_secrets!
+        DASH.config.validate_secrets!
 
         if options[:skip_push]
           say "Pull app image...", :magenta
-          invoke "kamal:cli:build:pull", [], invoke_options
+          invoke "dash:cli:build:pull", [], invoke_options
         else
           say "Build and push app image...", :magenta
-          invoke "kamal:cli:build:deliver", [], invoke_options
+          invoke "dash:cli:build:deliver", [], invoke_options
         end
 
         modify(lock: true) do
           run_hook "pre-deploy", secrets: true
 
           say "Detect stale containers...", :magenta
-          invoke "kamal:cli:app:stale_containers", [], invoke_options.merge(stop: true)
+          invoke "dash:cli:app:stale_containers", [], invoke_options.merge(stop: true)
 
-          invoke "kamal:cli:app:boot", [], invoke_options
+          invoke "dash:cli:app:boot", [], invoke_options
 
-          if KAMAL.config.proxy.load_balancing?
+          if DASH.config.proxy.load_balancing?
             say "Updating loadbalancer configuration...", :magenta
-            invoke "kamal:cli:proxy:loadbalancer", [ "deploy" ], invoke_options
+            invoke "dash:cli:proxy:loadbalancer", [ "deploy" ], invoke_options
           end
         end
       end
@@ -112,12 +112,12 @@ class Kamal::Cli::Main < Kamal::Cli::Base
         modify(lock: true) do
           invoke_options = deploy_options
 
-          KAMAL.config.version = version
+          DASH.config.version = version
 
           if container_available?(version)
             run_hook "pre-deploy", secrets: true
 
-            invoke "kamal:cli:app:boot", [], invoke_options.merge(version: version)
+            invoke "dash:cli:app:boot", [], invoke_options.merge(version: version)
             rolled_back = true
           else
             say "The app version '#{version}' is not available as a container (use 'dash app containers' for available versions)", :red
@@ -131,23 +131,23 @@ class Kamal::Cli::Main < Kamal::Cli::Base
 
   desc "details", "Show details about all containers"
   def details
-    invoke "kamal:cli:proxy:details"
-    invoke "kamal:cli:app:details"
-    invoke "kamal:cli:accessory:details", [ "all" ]
+    invoke "dash:cli:proxy:details"
+    invoke "dash:cli:app:details"
+    invoke "dash:cli:accessory:details", [ "all" ]
   end
 
   desc "audit", "Show audit log from servers"
   def audit
     quiet = options[:quiet]
-    on(KAMAL.hosts) do |host|
-      puts_by_host host, capture_with_info(*KAMAL.auditor.reveal), quiet: quiet
+    on(DASH.hosts) do |host|
+      puts_by_host host, capture_with_info(*DASH.auditor.reveal), quiet: quiet
     end
   end
 
   desc "config", "Show combined config (including secrets!)"
   def config
     run_locally do
-      puts Kamal::Utils.redacted(KAMAL.config.to_h).to_yaml
+      puts Dash::Utils.redacted(DASH.config.to_h).to_yaml
     end
   end
 
@@ -155,9 +155,9 @@ class Kamal::Cli::Main < Kamal::Cli::Base
   def docs(section = nil)
     case section
     when NilClass
-      puts Kamal::Configuration.validation_doc
+      puts Dash::Configuration.validation_doc
     else
-      puts Kamal::Configuration.const_get(section.titlecase.to_sym).validation_doc
+      puts Dash::Configuration.const_get(section.titlecase.to_sym).validation_doc
     end
   rescue NameError
     puts "No documentation found for #{section}"
@@ -168,7 +168,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
     say "Running readiness checks...", :magenta
     pre_connect_if_required
 
-    doctor = Kamal::Cli::Doctor.new
+    doctor = Dash::Cli::Doctor.new
     doctor.run
 
     print_doctor_report doctor.results
@@ -176,11 +176,11 @@ class Kamal::Cli::Main < Kamal::Cli::Base
     if doctor.successful?
       say doctor_summary(doctor), :green
     else
-      raise Kamal::Cli::DoctorError, doctor_failure_message(doctor)
+      raise Dash::Cli::DoctorError, doctor_failure_message(doctor)
     end
   end
 
-  desc "init", "Create config stub in config/deploy.yml and secrets stub in .kamal"
+  desc "init", "Create config stub in config/deploy.yml and secrets stub in .dash"
   option :bundle, type: :boolean, default: false, desc: "Add dash to the Gemfile and create a bin/dash binstub"
   def init
     require "fileutils"
@@ -193,18 +193,23 @@ class Kamal::Cli::Main < Kamal::Cli::Base
       puts "Created configuration file in config/deploy.yml"
     end
 
-    unless (secrets_file = Pathname.new(File.expand_path(".kamal/secrets"))).exist?
+    # Resolved rather than hardcoded to .dash: a project still on .kamal must
+    # keep getting its stubs there, or init would create a second directory that
+    # silently wins resolution and orphans the operator's real secrets.
+    project_directory = Dash::ProjectDirectory.path
+
+    unless (secrets_file = Pathname.new(File.expand_path("#{project_directory}/secrets"))).exist?
       FileUtils.mkdir_p secrets_file.dirname
       FileUtils.cp_r Pathname.new(File.expand_path("templates/secrets", __dir__)), secrets_file
-      puts "Created .kamal/secrets file"
+      puts "Created #{project_directory}/secrets file"
     end
 
-    unless (hooks_dir = Pathname.new(File.expand_path(".kamal/hooks"))).exist?
+    unless (hooks_dir = Pathname.new(File.expand_path("#{project_directory}/hooks"))).exist?
       hooks_dir.mkpath
       Pathname.new(File.expand_path("templates/sample_hooks", __dir__)).each_child do |sample_hook|
         FileUtils.cp sample_hook, hooks_dir, preserve: true
       end
-      puts "Created sample hooks in .kamal/hooks"
+      puts "Created sample hooks in #{project_directory}/hooks"
     end
 
     if options[:bundle]
@@ -226,14 +231,20 @@ class Kamal::Cli::Main < Kamal::Cli::Base
   def remove
     confirming "This will remove all containers and images. Are you sure?" do
       modify(lock: true) do
-        invoke "kamal:cli:app:remove", [], options.without(:confirmed)
-        invoke "kamal:cli:proxy:remove", [], options.without(:confirmed)
-        invoke "kamal:cli:accessory:remove", [ "all" ], options
-        invoke "kamal:cli:registry:remove", [], options.without(:confirmed).merge(skip_local: true)
+        invoke "dash:cli:app:remove", [], options.without(:confirmed)
+        invoke "dash:cli:proxy:remove", [], options.without(:confirmed)
+        invoke "dash:cli:accessory:remove", [ "all" ], options
+        invoke "dash:cli:registry:remove", [], options.without(:confirmed).merge(skip_local: true)
       end
     end
   end
 
+  desc "migrate", "Move this project's .kamal directory to .dash"
+  option :dry_run, type: :boolean, default: false, desc: "Report what would move without touching anything"
+  def migrate
+    Dash::Cli::Main::Migrate.new(dry_run: options[:dry_run]).run.each { |message, color| say message, color }
+  end
+
   desc "upgrade", "Upgrade from Kamal 1.x to 2.0"
   option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
   option :rolling, type: :boolean, default: false, desc: "Upgrade one host at a time"
@@ -241,24 +252,24 @@ class Kamal::Cli::Main < Kamal::Cli::Base
     confirming "This will replace Traefik with kamal-proxy and restart all accessories" do
       modify(lock: true) do
         if options[:rolling]
-          KAMAL.hosts.each do |host|
-            KAMAL.with_specific_hosts(host) do
+          DASH.hosts.each do |host|
+            DASH.with_specific_hosts(host) do
               say "Upgrading #{host}...", :magenta
-              if KAMAL.app_hosts.include?(host)
-                invoke "kamal:cli:proxy:upgrade", [], options.merge(confirmed: true, rolling: false)
-                reset_invocation(Kamal::Cli::Proxy)
+              if DASH.app_hosts.include?(host)
+                invoke "dash:cli:proxy:upgrade", [], options.merge(confirmed: true, rolling: false)
+                reset_invocation(Dash::Cli::Proxy)
               end
-              if KAMAL.accessory_hosts.include?(host)
-                invoke "kamal:cli:accessory:upgrade", [ "all" ], options.merge(confirmed: true, rolling: false)
-                reset_invocation(Kamal::Cli::Accessory)
+              if DASH.accessory_hosts.include?(host)
+                invoke "dash:cli:accessory:upgrade", [ "all" ], options.merge(confirmed: true, rolling: false)
+                reset_invocation(Dash::Cli::Accessory)
               end
               say "Upgraded #{host}", :magenta
             end
           end
         else
           say "Upgrading all hosts...", :magenta
-          invoke "kamal:cli:proxy:upgrade", [], options.merge(confirmed: true)
-          invoke "kamal:cli:accessory:upgrade", [ "all" ], options.merge(confirmed: true)
+          invoke "dash:cli:proxy:upgrade", [], options.merge(confirmed: true)
+          invoke "dash:cli:accessory:upgrade", [ "all" ], options.merge(confirmed: true)
           say "Upgraded all hosts", :magenta
         end
       end
@@ -267,42 +278,42 @@ class Kamal::Cli::Main < Kamal::Cli::Base
 
   desc "version", "Show dash version"
   def version
-    puts Kamal::VERSION
+    puts Dash::VERSION
   end
 
   desc "accessory", "Manage accessories (db/redis/search)"
-  subcommand "accessory", Kamal::Cli::Accessory
+  subcommand "accessory", Dash::Cli::Accessory
 
   desc "app", "Manage application"
-  subcommand "app", Kamal::Cli::App
+  subcommand "app", Dash::Cli::App
 
   desc "build", "Build application image"
-  subcommand "build", Kamal::Cli::Build
+  subcommand "build", Dash::Cli::Build
 
   desc "lock", "Manage the deploy lock"
-  subcommand "lock", Kamal::Cli::Lock
+  subcommand "lock", Dash::Cli::Lock
 
   desc "proxy", "Manage kamal-proxy"
-  subcommand "proxy", Kamal::Cli::Proxy
+  subcommand "proxy", Dash::Cli::Proxy
 
   desc "prune", "Prune old application images and containers"
-  subcommand "prune", Kamal::Cli::Prune
+  subcommand "prune", Dash::Cli::Prune
 
   desc "registry", "Login and -out of the image registry"
-  subcommand "registry", Kamal::Cli::Registry
+  subcommand "registry", Dash::Cli::Registry
 
   desc "secrets", "Helpers for extracting secrets"
-  subcommand "secrets", Kamal::Cli::Secrets
+  subcommand "secrets", Dash::Cli::Secrets
 
   desc "server", "Bootstrap servers with curl and Docker"
-  subcommand "server", Kamal::Cli::Server
+  subcommand "server", Dash::Cli::Server
 
   private
     def container_available?(version)
       begin
-        on(KAMAL.app_hosts) do
-          KAMAL.roles_on(host).each do |role|
-            container_id = capture_with_info(*KAMAL.app(role: role, host: host).container_id_for_version(version))
+        on(DASH.app_hosts) do
+          DASH.roles_on(host).each do |role|
+            container_id = capture_with_info(*DASH.app(role: role, host: host).container_id_for_version(version))
             raise "Container not found" unless container_id.present?
           end
         end
@@ -321,13 +332,13 @@ class Kamal::Cli::Main < Kamal::Cli::Base
     def deploy_options
       base_options = options.without("skip_push")
       base_options = base_options.except("no_cache") unless base_options["no_cache"]
-      { "version" => KAMAL.config.version }.merge(base_options)
+      { "version" => DASH.config.version }.merge(base_options)
     end
 
     def print_doctor_report(results)
       results.group_by(&:title).each do |title, rows|
         say title
-        rows.each { |row| say "  #{row}", Kamal::Cli::Doctor::STATUS_COLORS[row.status] }
+        rows.each { |row| say "  #{row}", Dash::Cli::Doctor::STATUS_COLORS[row.status] }
       end
     end
 
@@ -345,7 +356,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
     end
 
     def print_config_banner
-      config = KAMAL.config
+      config = DASH.config
 
       say "Deploying #{config.service}#{" to #{config.destination}" if config.destination} (version #{config.abbreviated_version})", :magenta
       config.roles.each do |role|

data/lib/{kamal → dash}/cli/proxy/drift.rb

@@ -1,4 +1,4 @@
-class Kamal::Cli::Proxy::Drift
+class Dash::Cli::Proxy::Drift
   attr_reader :host, :sshkit
   delegate :capture_with_info, to: :sshkit
 
@@ -24,7 +24,7 @@ class Kamal::Cli::Proxy::Drift
     @expected_digest ||= if proxy.proxy_run_config
       proxy.proxy_run_config.config_digest
     else
-      Kamal::Configuration::Proxy::Run.digest(capture_with_info(*proxy.boot_config).strip)
+      Dash::Configuration::Proxy::Run.digest(capture_with_info(*proxy.boot_config).strip)
     end
   end
 
@@ -34,6 +34,6 @@ class Kamal::Cli::Proxy::Drift
     end
 
     def proxy
-      @proxy ||= KAMAL.proxy(host)
+      @proxy ||= DASH.proxy(host)
     end
 end

data/lib/{kamal → dash}/cli/proxy/loadbalancer_claim.rb

@@ -1,7 +1,7 @@
 # Ownership bookkeeping for a load balancer host that more than one dash app
 # may be deploying to. Kamal only ever sees one deploy.yml at a time, so the
 # other apps are visible solely through the files they left on the host.
-class Kamal::Cli::Proxy::LoadbalancerClaim
+class Dash::Cli::Proxy::LoadbalancerClaim
   attr_reader :host, :sshkit
   delegate :capture_with_info, :execute, :upload!, :warn, to: :sshkit
 
@@ -55,11 +55,11 @@ class Kamal::Cli::Proxy::LoadbalancerClaim
 
   private
     def config
-      KAMAL.loadbalancer_config
+      DASH.loadbalancer_config
     end
 
     def commands
-      KAMAL.loadbalancer
+      DASH.loadbalancer
     end
 
     # Owner tokens are "<service-and-destination> <repository>"; the repository

data/lib/{kamal → dash}/cli/proxy/loadbalancer_reboot.rb

@@ -5,7 +5,7 @@
 # Unlike the proxy hosts' port-holder handoff this is stop -> run: the
 # loadbalancer keeps its service state in the config volume, which the
 # replacement container re-mounts, so every app's routes survive the gap.
-class Kamal::Cli::Proxy::LoadbalancerReboot
+class Dash::Cli::Proxy::LoadbalancerReboot
   READY_TIMEOUT = 30
 
   attr_reader :host, :sshkit
@@ -17,30 +17,30 @@ class Kamal::Cli::Proxy::LoadbalancerReboot
   end
 
   def run
-    execute *KAMAL.auditor.record("Rebooted loadbalancer"), verbosity: :debug
-    execute *KAMAL.registry.login
+    execute *DASH.auditor.record("Rebooted loadbalancer"), verbosity: :debug
+    execute *DASH.registry.login
 
-    info "Stopping and removing #{KAMAL.loadbalancer.container_name} on #{host}, if running..."
-    execute *KAMAL.loadbalancer.stop, raise_on_non_zero_exit: false
-    execute *KAMAL.loadbalancer.remove_container
+    info "Stopping and removing #{DASH.loadbalancer.container_name} on #{host}, if running..."
+    execute *DASH.loadbalancer.stop, raise_on_non_zero_exit: false
+    execute *DASH.loadbalancer.remove_container
 
-    if (lb_run = KAMAL.loadbalancer_config.run).secrets?
-      execute *KAMAL.loadbalancer.ensure_proxy_directory
+    if (lb_run = DASH.loadbalancer_config.run).secrets?
+      execute *DASH.loadbalancer.ensure_proxy_directory
       upload! lb_run.secrets_io, lb_run.secrets_path, mode: "0600"
     else
-      execute *KAMAL.loadbalancer.remove_proxy_secrets_file, raise_on_non_zero_exit: false
+      execute *DASH.loadbalancer.remove_proxy_secrets_file, raise_on_non_zero_exit: false
     end
 
-    execute *KAMAL.loadbalancer.ensure_apps_config_directory
-    Kamal::Cli::Proxy::LoadbalancerClaim.new(host, sshkit).claim_run_config(replace: true)
-    execute *KAMAL.loadbalancer.run
+    execute *DASH.loadbalancer.ensure_apps_config_directory
+    Dash::Cli::Proxy::LoadbalancerClaim.new(host, sshkit).claim_run_config(replace: true)
+    execute *DASH.loadbalancer.run
 
     wait_until_ready
     verify_service if re_register_service
 
     # kamal-proxy keeps its service state in the config volume, which the
     # replacement container re-mounts - every app's routes survive.
-    services = capture_with_info(*KAMAL.loadbalancer.list).strip
+    services = capture_with_info(*DASH.loadbalancer.list).strip
     info "Services registered on the load balancer at #{host} after reboot:\n#{services}"
   end
 
@@ -49,9 +49,9 @@ class Kamal::Cli::Proxy::LoadbalancerReboot
       deadline = Time.now + READY_TIMEOUT
 
       begin
-        capture_with_info(*KAMAL.loadbalancer.list, verbosity: :debug)
+        capture_with_info(*DASH.loadbalancer.list, verbosity: :debug)
       rescue SSHKit::Command::Failed
-        raise Kamal::Cli::BootError, "the load balancer on #{host} did not become ready within #{READY_TIMEOUT} seconds" if Time.now >= deadline
+        raise Dash::Cli::BootError, "the load balancer on #{host} did not become ready within #{READY_TIMEOUT} seconds" if Time.now >= deadline
         sleep 0.5
         retry
       end
@@ -67,21 +67,21 @@ class Kamal::Cli::Proxy::LoadbalancerReboot
     # --recheck-targets-on-restore re-verifies). No owner record, or a foreign
     # one, means nothing of ours to restore.
     def re_register_service
-      owner = capture_with_info(*KAMAL.loadbalancer.read_service_owner, raise_on_non_zero_exit: false).strip
-      return false unless owner == KAMAL.loadbalancer_config.owner_token
+      owner = capture_with_info(*DASH.loadbalancer.read_service_owner, raise_on_non_zero_exit: false).strip
+      return false unless owner == DASH.loadbalancer_config.owner_token
 
-      info "Re-registering #{KAMAL.config.service} with the load balancer on #{host}..."
-      execute *KAMAL.loadbalancer.deploy(targets: KAMAL.loadbalancer_config.target_hosts)
+      info "Re-registering #{DASH.config.service} with the load balancer on #{host}..."
+      execute *DASH.loadbalancer.deploy(targets: DASH.loadbalancer_config.target_hosts)
       true
     end
 
     # `list --json` returns {"services": {"<name>": ...}} - exact key
     # membership, same as the per-host proxy reboot's verification.
     def verify_service
-      listed = JSON.parse(capture_with_info(*KAMAL.loadbalancer.list(json: true))).fetch("services", {}).keys
+      listed = JSON.parse(capture_with_info(*DASH.loadbalancer.list(json: true))).fetch("services", {}).keys
 
-      unless listed.include?(KAMAL.config.service)
-        raise Kamal::Cli::BootError, "the load balancer on #{host} is missing service #{KAMAL.config.service} after reboot"
+      unless listed.include?(DASH.config.service)
+        raise Dash::Cli::BootError, "the load balancer on #{host} is missing service #{DASH.config.service} after reboot"
       end
     end
 end

data/lib/{kamal → dash}/cli/proxy/reboot.rb

@@ -1,4 +1,4 @@
-class Kamal::Cli::Proxy::Reboot
+class Dash::Cli::Proxy::Reboot
   READY_TIMEOUT = 30
 
   attr_reader :host, :sshkit
@@ -10,8 +10,8 @@ class Kamal::Cli::Proxy::Reboot
   end
 
   def run
-    execute *KAMAL.auditor.record("Rebooted proxy"), verbosity: :debug
-    execute *KAMAL.registry.login
+    execute *DASH.auditor.record("Rebooted proxy"), verbosity: :debug
+    execute *DASH.registry.login
 
     pull_image
     replace_container
@@ -21,11 +21,11 @@ class Kamal::Cli::Proxy::Reboot
 
   private
     def proxy
-      @proxy ||= KAMAL.proxy(host)
+      @proxy ||= DASH.proxy(host)
     end
 
     def drift
-      @drift ||= Kamal::Cli::Proxy::Drift.new(host, sshkit)
+      @drift ||= Dash::Cli::Proxy::Drift.new(host, sshkit)
     end
 
     # Pull before stopping the old container: a registry outage or rate limit
@@ -52,7 +52,7 @@ class Kamal::Cli::Proxy::Reboot
     # generation starts. This used to live inside stop_and_replace only, and
     # the port-holder paths launched their generation without it — a
     # port-holder reboot on a host without the file died with
-    # "open .kamal/proxy/secrets.env: no such file or directory".
+    # "open .dash/proxy/secrets.env: no such file or directory".
     def sync_proxy_secrets
       if (run_config = proxy.proxy_run_config)&.secrets?
         upload! run_config.secrets_io, run_config.secrets_path, mode: "0600"
@@ -65,7 +65,7 @@ class Kamal::Cli::Proxy::Reboot
     # Phase 1 replacement: stop the old container, start the new one. Brief gap.
     def stop_and_replace
       info "Stopping and removing kamal-proxy on #{host}, if running..."
-      execute *proxy.stop(timeout: KAMAL.config.drain_timeout + 10), raise_on_non_zero_exit: false
+      execute *proxy.stop(timeout: DASH.config.drain_timeout + 10), raise_on_non_zero_exit: false
       execute *proxy.remove_container
 
       execute *proxy.run(digest: drift.expected_digest)
@@ -93,7 +93,7 @@ class Kamal::Cli::Proxy::Reboot
       wait_until_ready(name: proxy.next_container_name)
 
       execute *proxy.disable_restart
-      execute *proxy.drain(timeout: KAMAL.config.drain_timeout)
+      execute *proxy.drain(timeout: DASH.config.drain_timeout)
       execute *proxy.wait_for_exit
       execute *proxy.remove_stopped_container
       execute *proxy.promote_next_container
@@ -103,7 +103,7 @@ class Kamal::Cli::Proxy::Reboot
     # them until it is gone. One final replacement with a brief gap.
     def migrate_to_holder
       info "Migrating kamal-proxy on #{host} to the port-holder architecture (brief gap)..."
-      execute *proxy.stop(timeout: KAMAL.config.drain_timeout + 10), raise_on_non_zero_exit: false
+      execute *proxy.stop(timeout: DASH.config.drain_timeout + 10), raise_on_non_zero_exit: false
       execute *proxy.remove_container
 
       execute *proxy.run_holder
@@ -124,7 +124,7 @@ class Kamal::Cli::Proxy::Reboot
       begin
         capture_with_info(*proxy.list(**{ name: name }.compact), verbosity: :debug)
       rescue SSHKit::Command::Failed
-        raise Kamal::Cli::BootError, "kamal-proxy on #{host} did not become ready within #{READY_TIMEOUT} seconds" if Time.now >= deadline
+        raise Dash::Cli::BootError, "kamal-proxy on #{host} did not become ready within #{READY_TIMEOUT} seconds" if Time.now >= deadline
         sleep 0.5
         retry
       end
@@ -137,8 +137,8 @@ class Kamal::Cli::Proxy::Reboot
     def re_register_services
       registered_services = []
 
-      KAMAL.roles_on(host).select(&:running_proxy?).each do |role|
-        app = KAMAL.app(role: role, host: host)
+      DASH.roles_on(host).select(&:running_proxy?).each do |role|
+        app = DASH.app(role: role, host: host)
 
         version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip.presence
         next unless version
@@ -151,10 +151,10 @@ class Kamal::Cli::Proxy::Reboot
         registered_services << role.container_prefix
       end
 
-      KAMAL.config.accessories.select(&:running_proxy?).each do |accessory_config|
+      DASH.config.accessories.select(&:running_proxy?).each do |accessory_config|
         next unless accessory_config.hosts.include?(host.to_s)
 
-        accessory = KAMAL.accessory(accessory_config.name)
+        accessory = DASH.accessory(accessory_config.name)
         target = capture_with_info(*accessory.container_id_for(container_name: accessory_config.service_name, only_running: true), raise_on_non_zero_exit: false).strip.presence
         next unless target
 
@@ -176,7 +176,7 @@ class Kamal::Cli::Proxy::Reboot
       missing = registered_services - listed
 
       if missing.any?
-        raise Kamal::Cli::BootError, "kamal-proxy on #{host} is missing services after reboot: #{missing.join(", ")}"
+        raise Dash::Cli::BootError, "kamal-proxy on #{host} is missing services after reboot: #{missing.join(", ")}"
       end
     end
 end