Add kamal proxy update

For easy updates from Traefik to kamal-proxy, add `kamal proxy update`.

This stops and removes Traefik and kamal-proxy containers (just in case
it is run after an update). Then it starts kamal-proxy and calls
`kamal-proxy deploy` to route to any app containers that are already
running.

It can be run with a rolling option and calls the `pre-proxy-reboot` and
`post-proxy-reboot` hooks for each host.

.github/workflows/ci.yml

@@ -24,12 +24,25 @@ jobs:
     strategy:
       matrix:
         ruby-version:
+          - "2.7"
           - "3.1"
           - "3.2"
           - "3.3"
         gemfile:
           - Gemfile
+          - gemfiles/ruby_2.7.gemfile
           - gemfiles/rails_edge.gemfile
+        exclude:
+          - ruby-version: "2.7"
+            gemfile: Gemfile
+          - ruby-version: "2.7"
+            gemfile: gemfiles/rails_edge.gemfile
+          - ruby-version: "3.1"
+            gemfile: gemfiles/ruby_2.7.gemfile
+          - ruby-version: "3.2"
+            gemfile: gemfiles/ruby_2.7.gemfile
+          - ruby-version: "3.3"
+            gemfile: gemfiles/ruby_2.7.gemfile
     name: ${{ format('Tests (Ruby {0})', matrix.ruby-version) }}
     runs-on: ubuntu-latest
     continue-on-error: true

Dockerfile

@@ -14,7 +14,7 @@ COPY Gemfile Gemfile.lock kamal.gemspec ./
 COPY lib/kamal/version.rb /kamal/lib/kamal/version.rb
 
 # Install system dependencies
-RUN apk add --no-cache build-base git docker openrc openssh-client-default \
+RUN apk add --no-cache --update build-base git docker openrc openssh-client-default \
     && rc-update add docker boot \
     && gem install bundler --version=2.4.3 \
     && bundle install

Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    kamal (2.0.0.alpha)
+    kamal (1.5.2)
       activesupport (>= 7.0)
       base64 (~> 0.2)
       bcrypt_pbkdf (~> 1.0)
       concurrent-ruby (~> 1.2)
-      dotenv (~> 3.1)
+      dotenv (~> 2.8)
       ed25519 (~> 1.2)
       net-ssh (~> 7.0)
-      sshkit (>= 1.23.0, < 2.0)
+      sshkit (>= 1.22.2, < 2.0)
-      thor (~> 1.3)
+      thor (~> 1.2)
       zeitwerk (~> 2.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.1.3.4)
+    actionpack (7.1.2)
-      actionview (= 7.1.3.4)
+      actionview (= 7.1.2)
-      activesupport (= 7.1.3.4)
+      activesupport (= 7.1.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -26,13 +26,13 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actionview (7.1.3.4)
+    actionview (7.1.2)
-      activesupport (= 7.1.3.4)
+      activesupport (= 7.1.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.4)
+    activesupport (7.1.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -44,55 +44,54 @@ GEM
       tzinfo (~> 2.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.0)
-    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bigdecimal (3.1.5)
-    bcrypt_pbkdf (1.1.1-x86_64-darwin)
+    builder (3.2.4)
-    bigdecimal (3.1.8)
+    concurrent-ruby (1.2.2)
-    builder (3.3.0)
-    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
-    debug (1.9.2)
+    debug (1.9.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    dotenv (3.1.2)
+    dotenv (2.8.1)
-    drb (2.2.1)
+    drb (2.2.0)
+      ruby2_keywords
     ed25519 (1.3.0)
-    erubi (1.13.0)
+    erubi (1.12.0)
-    i18n (1.14.5)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.2)
+    io-console (0.7.1)
-    irb (1.14.0)
+    irb (1.11.0)
-      rdoc (>= 4.0.0)
+      rdoc
-      reline (>= 0.4.2)
+      reline (>= 0.3.8)
-    json (2.7.2)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.24.1)
+    minitest (5.20.0)
-    mocha (2.4.5)
+    mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mutex_m (0.2.0)
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
-    net-ssh (7.2.3)
+    net-ssh (7.2.1)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.16.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.16.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.25.1)
+    parallel (1.24.0)
-    parser (3.3.4.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
-    racc (1.8.1)
+    racc (1.7.3)
-    rack (3.1.7)
+    rack (3.0.8)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -107,43 +106,42 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.4)
+    railties (7.1.2)
-      actionpack (= 7.1.3.4)
+      actionpack (= 7.1.2)
-      activesupport (= 7.1.3.4)
+      activesupport (= 7.1.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.2.1)
+    rake (13.1.0)
-    rdoc (6.7.0)
+    rdoc (6.6.2)
       psych (>= 4.0.0)
-    regexp_parser (2.9.2)
+    regexp_parser (2.9.0)
-    reline (0.5.9)
+    reline (0.4.2)
       io-console (~> 0.5)
-    rexml (3.3.4)
+    rexml (3.2.6)
-      strscan
+    rubocop (1.62.1)
-    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.0)
+    rubocop-ast (1.31.2)
-      parser (>= 3.3.1.0)
+      parser (>= 3.3.0.4)
-    rubocop-minitest (0.35.1)
+    rubocop-minitest (0.35.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.24.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -155,19 +153,19 @@ GEM
       rubocop-rails
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    sshkit (1.23.0)
+    sshkit (1.22.2)
       base64
+      mutex_m
       net-scp (>= 1.1.2)
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    stringio (3.1.1)
+    stringio (3.1.0)
-    strscan (3.1.0)
+    thor (1.3.0)
-    thor (1.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
-    zeitwerk (2.6.17)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   arm64-darwin

README.md

@@ -1,6 +1,6 @@
 # Kamal: Deploy web apps anywhere
 
-From bare metal to cloud VMs, deploy web apps anywhere with zero downtime. Kamal has the dynamic reverse-proxy Traefik hold requests while a new app container is started and the old one is stopped. Works seamlessly across multiple hosts, using SSHKit to execute commands. Originally built for Rails apps, Kamal will work with any type of web app that can be containerized with Docker.
+From bare metal to cloud VMs, deploy web apps anywhere with zero downtime. Kamal uses a [custom proxy](https://github.com/basecamp/kamal-proxy) for zero-downtime deployments. Works seamlessly across multiple hosts, using SSHKit to execute commands. Originally built for Rails apps, Kamal will work with any type of web app that can be containerized with Docker.
 
 ➡️ See [kamal-deploy.org](https://kamal-deploy.org) for documentation on [installation](https://kamal-deploy.org/docs/installation), [configuration](https://kamal-deploy.org/docs/configuration), and [commands](https://kamal-deploy.org/docs/commands).
 

bin/docs

@@ -1,137 +0,0 @@
-#!/usr/bin/env ruby
-require "stringio"
-
-def usage
-  puts "Usage: #{$0} <kamal_site_repo>"
-  exit 1
-end
-
-usage if ARGV.size != 1
-
-kamal_site_repo = ARGV[0]
-
-if !File.directory?(kamal_site_repo)
-  puts "Error: #{kamal_site_repo} is not a directory"
-  exit 1
-end
-
-DOCS = {
-  "accessory" => "Accessories",
-  "alias" => "Aliases",
-  "boot" => "Booting",
-  "builder" => "Builders",
-  "configuration" => "Configuration overview",
-  "env" => "Environment variables",
-  "healthcheck" => "Healthchecks",
-  "logging" => "Logging",
-  "proxy" => "Proxy (Experimental)",
-  "registry" => "Docker Registry",
-  "role" => "Roles",
-  "servers" => "Servers",
-  "ssh" => "SSH",
-  "sshkit" => "SSHKit",
-  "traefik" => "Traefik"
-}
-
-class DocWriter
-  attr_reader :from_file, :to_file, :key, :heading, :body, :output, :in_yaml
-
-  def initialize(from_file, to_dir)
-    @from_file = from_file
-    @key = File.basename(from_file, ".yml")
-    @to_file = File.join(to_dir, "#{linkify(DOCS[key])}.md")
-    @body = File.readlines(from_file)
-    @heading = body.shift.chomp("\n")
-    @output = nil
-  end
-
-  def write
-    puts "Writing #{to_file}"
-    generate_markdown
-    File.write(to_file, output.string)
-  end
-
-  private
-    def generate_markdown
-      @output = StringIO.new
-
-      generate_header
-
-      place = :in_section
-
-      loop do
-        line = body.shift&.chomp("\n")
-        break if line.nil?
-
-        case place
-        when :new_section, :in_section
-          if line.empty?
-            output.puts
-            place = :new_section
-          elsif line =~ /^ *#/
-            generate_line(line, heading: place == :new_section)
-            place = :in_section
-          else
-            output.puts "```yaml"
-            output.puts line
-            place = :in_yaml
-          end
-        when :in_yaml, :in_empty_line_yaml
-          if line =~ /^ *#/
-            output.puts "```"
-            generate_line(line, heading: place == :in_empty_line_yaml)
-            place = :in_section
-          elsif line.empty?
-            place = :in_empty_line_yaml
-          else
-            output.puts line
-          end
-        end
-      end
-
-      output.puts "```" if place == :in_yaml
-    end
-
-    def generate_header
-      output.puts "---"
-      output.puts "title: #{heading[2..-1]}"
-      output.puts "---"
-      output.puts
-      output.puts heading
-      output.puts
-    end
-
-    def generate_line(line, heading: false)
-      line = line.gsub(/^ *#\s?/, "")
-
-      if line =~ /(.*)kamal docs ([a-z]*)(.*)/
-        line = "#{$1}[#{DOCS[$2]}](../#{linkify(DOCS[$2])})#{$3}"
-      end
-
-      if line =~ /(.*)https:\/\/kamal-deploy.org([a-z\/-]*)(.*)/
-        line = "#{$1}[#{titlify($2.split("/").last)}](#{$2})#{$3}"
-      end
-
-      if heading
-        output.puts "## [#{line}](##{linkify(line)})"
-      else
-        output.puts line
-      end
-    end
-
-    def linkify(text)
-      text.downcase.gsub(" ", "-")
-    end
-
-    def titlify(text)
-      text.capitalize.gsub("-", " ")
-    end
-end
-
-from_dir = File.join(File.dirname(__FILE__), "../lib/kamal/configuration/docs")
-to_dir = File.join(kamal_site_repo, "docs/configuration")
-Dir.glob("#{from_dir}/*") do |from_file|
-  key = File.basename(from_file, ".yml")
-
-  DocWriter.new(from_file, to_dir).write
-end

gemfiles/ruby_2.7.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gemspec path: "../"
+
+gem "nokogiri", "~> 1.15.0"

kamal.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |spec|
   spec.executables = %w[ kamal ]
 
   spec.add_dependency "activesupport", ">= 7.0"
-  spec.add_dependency "sshkit", ">= 1.23.0", "< 2.0"
+  spec.add_dependency "sshkit", ">= 1.22.2", "< 2.0"
   spec.add_dependency "net-ssh", "~> 7.0"
-  spec.add_dependency "thor", "~> 1.3"
+  spec.add_dependency "thor", "~> 1.2"
-  spec.add_dependency "dotenv", "~> 3.1"
+  spec.add_dependency "dotenv", "~> 2.8"
   spec.add_dependency "zeitwerk", "~> 2.5"
   spec.add_dependency "ed25519", "~> 1.2"
   spec.add_dependency "bcrypt_pbkdf", "~> 1.0"

lib/kamal.rb

@@ -1,14 +1,10 @@
 module Kamal
-  class ConfigurationError < StandardError; end
 end
 
 require "active_support"
 require "zeitwerk"
-require "yaml"
-require "tmpdir"
-require "pathname"
 
 loader = Zeitwerk::Loader.for_gem
 loader.ignore(File.join(__dir__, "kamal", "sshkit_with_ext.rb"))
 loader.setup
-loader.eager_load_namespace(Kamal::Cli) # We need all commands loaded.
+loader.eager_load # We need all commands loaded.

lib/kamal/cli.rb

@@ -1,7 +1,7 @@
 module Kamal::Cli
-  class BootError < StandardError; end
-  class HookError < StandardError; end
   class LockError < StandardError; end
+  class HookError < StandardError; end
+  class BootError < StandardError; end
 end
 
 # SSHKit uses instance eval, so we need a global const for ergonomics

lib/kamal/cli/accessory.rb

@@ -1,20 +1,17 @@
 class Kamal::Cli::Accessory < Kamal::Cli::Base
   desc "boot [NAME]", "Boot new accessory service on host (use NAME=all to boot all accessories)"
-  def boot(name, prepare: true)
+  def boot(name, login: true)
     with_lock do
       if name == "all"
         KAMAL.accessory_names.each { |accessory_name| boot(accessory_name) }
       else
-        prepare(name) if prepare
-
         with_accessory(name) do |accessory, hosts|
           directories(name)
           upload(name)
 
           on(hosts) do
+            execute *KAMAL.registry.login if login
             execute *KAMAL.auditor.record("Booted #{name} accessory"), verbosity: :debug
-            execute *accessory.ensure_env_directory
-            upload! accessory.secrets_io, accessory.secrets_path, mode: "0600"
             execute *accessory.run
           end
         end
@@ -58,10 +55,15 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
       if name == "all"
         KAMAL.accessory_names.each { |accessory_name| reboot(accessory_name) }
       else
-        prepare(name)
+        with_accessory(name) do |accessory, hosts|
+          on(hosts) do
+            execute *KAMAL.registry.login
+          end
+
           stop(name)
           remove_container(name)
-        boot(name, prepare: false)
+          boot(name, login: false)
+        end
       end
     end
   end
@@ -93,10 +95,12 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
   desc "restart [NAME]", "Restart existing accessory container on host"
   def restart(name)
     with_lock do
+      with_accessory(name) do
         stop(name)
         start(name)
       end
     end
+  end
 
   desc "details [NAME]", "Show details about accessory on host (use NAME=all to show all accessories)"
   def details(name)
@@ -145,25 +149,23 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
   option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
   option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
   option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
-  option :grep_options, aliases: "-o", desc: "Additional options supplied to grep"
   option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
   def logs(name)
     with_accessory(name) do |accessory, hosts|
       grep = options[:grep]
-      grep_options = options[:grep_options]
 
       if options[:follow]
         run_locally do
           info "Following logs on #{hosts}..."
-          info accessory.follow_logs(grep: grep, grep_options: grep_options)
+          info accessory.follow_logs(grep: grep)
-          exec accessory.follow_logs(grep: grep, grep_options: grep_options)
+          exec accessory.follow_logs(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(hosts) do
-          puts capture_with_info(*accessory.logs(since: since, lines: lines, grep: grep, grep_options: grep_options))
+          puts capture_with_info(*accessory.logs(since: since, lines: lines, grep: grep))
         end
       end
     end
@@ -245,20 +247,11 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
     end
 
     def remove_accessory(name)
+      with_accessory(name) do
         stop(name)
         remove_container(name)
         remove_image(name)
         remove_service_directory(name)
       end
-
-    def prepare(name)
-      with_accessory(name) do |accessory, hosts|
-        on(hosts) do
-          execute *KAMAL.registry.login
-          execute *KAMAL.docker.create_network
-        rescue SSHKit::Command::Failed => e
-          raise unless e.message.include?("already exists")
-        end
-      end
     end
 end

lib/kamal/cli/alias/command.rb

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

lib/kamal/cli/app.rb

@@ -9,16 +9,16 @@ class Kamal::Cli::App < Kamal::Cli::Base
         # Assets are prepared in a separate step to ensure they are on all hosts before booting
         on(KAMAL.hosts) do
           KAMAL.roles_on(host).each do |role|
-            Kamal::Cli::App::PrepareAssets.new(host, role, self).run
+            PrepareAssets.new(host, role, self).run
           end
         end
 
         # Primary hosts and roles are returned first, so they can open the barrier
-        barrier = Kamal::Cli::Healthcheck::Barrier.new
+        barrier = Barrier.new if KAMAL.roles.many?
 
         on(KAMAL.hosts, **KAMAL.boot_strategy) do |host|
           KAMAL.roles_on(host).each do |role|
-            Kamal::Cli::App::Boot.new(host, role, self, version, barrier).run
+            Boot.new(host, role, self, version, barrier).run
           end
         end
 
@@ -42,9 +42,9 @@ class Kamal::Cli::App < Kamal::Cli::Base
           execute *KAMAL.auditor.record("Started app version #{KAMAL.config.version}"), verbosity: :debug
           execute *app.start, raise_on_non_zero_exit: false
 
-          if role.running_traefik? && KAMAL.proxy_host?(host)
+          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
+            endpoint = capture_with_info(*app.container_endpoint(version: version)).strip
             raise Kamal::Cli::BootError, "Failed to get endpoint for #{role} on #{host}, did the container boot?" if endpoint.empty?
 
             execute *KAMAL.proxy.deploy(role.container_prefix, target: endpoint)
@@ -62,11 +62,12 @@ class Kamal::Cli::App < Kamal::Cli::Base
 
         roles.each do |role|
           app = KAMAL.app(role: role, host: host)
+          version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
+
           execute *KAMAL.auditor.record("Stopped app", role: role), verbosity: :debug
 
-          if role.running_traefik? && KAMAL.proxy_host?(host)
+          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_endpoint(version: version)).strip
-            endpoint = capture_with_info(*app.container_id_for_version(version)).strip
             if endpoint.present?
               execute *KAMAL.proxy.remove(role.container_prefix, target: endpoint), raise_on_non_zero_exit: false
             end
@@ -90,12 +91,11 @@ class Kamal::Cli::App < Kamal::Cli::Base
     end
   end
 
-  desc "exec [CMD...]", "Execute a custom command on servers within the app container (use --help to show options)"
+  desc "exec [CMD]", "Execute a custom command on servers within the app container (use --help to show options)"
   option :interactive, aliases: "-i", type: :boolean, default: false, desc: "Execute command over ssh for an interactive shell (use for console/bash)"
   option :reuse, type: :boolean, default: false, desc: "Reuse currently running container instead of starting a new one"
   option :env, aliases: "-e", type: :hash, desc: "Set environment variables for the command"
-  def exec(*cmd)
+  def exec(cmd)
-    cmd = Kamal::Utils.join_commands(cmd)
     env = options[:env]
     case
     when options[:interactive] && options[:reuse]
@@ -186,15 +186,12 @@ class Kamal::Cli::App < Kamal::Cli::Base
   option :since, aliases: "-s", desc: "Show lines since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
   option :lines, type: :numeric, aliases: "-n", desc: "Number of lines to show from each server"
   option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
-  option :grep_options, aliases: "-o", desc: "Additional options supplied to grep"
   option :follow, aliases: "-f", desc: "Follow log on primary server (or specific host set by --hosts)"
   def logs
     # FIXME: Catch when app containers aren't running
 
     grep = options[:grep]
-    grep_options = options[:grep_options]
     since = options[:since]
-
     if options[:follow]
       lines = options[:lines].presence || ((since || grep) ? nil : 10) # Default to 10 lines if since or grep isn't set
 
@@ -205,8 +202,8 @@ class Kamal::Cli::App < Kamal::Cli::Base
         role = KAMAL.roles_on(KAMAL.primary_host).first
 
         app = KAMAL.app(role: role, host: host)
-        info app.follow_logs(host: KAMAL.primary_host, lines: lines, grep: grep, grep_options: grep_options)
+        info app.follow_logs(host: KAMAL.primary_host, lines: lines, grep: grep)
-        exec app.follow_logs(host: KAMAL.primary_host, lines: lines, grep: grep, grep_options: grep_options)
+        exec app.follow_logs(host: KAMAL.primary_host, lines: lines, grep: grep)
       end
     else
       lines = options[:lines].presence || ((since || grep) ? nil : 100) # Default to 100 lines if since or grep isn't set
@@ -216,7 +213,7 @@ class Kamal::Cli::App < Kamal::Cli::Base
 
         roles.each do |role|
           begin
-            puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).logs(since: since, lines: lines, grep: grep, grep_options: grep_options))
+            puts_by_host host, capture_with_info(*KAMAL.app(role: role, host: host).logs(since: since, lines: lines, grep: grep))
           rescue SSHKit::Command::Failed
             puts_by_host host, "Nothing found"
           end

lib/kamal/cli/app/barrier.rb

@@ -1,6 +1,4 @@
-require "concurrent/ivar"
+class Kamal::Cli::App::Barrier
-
-class Kamal::Cli::Healthcheck::Barrier
   def initialize
     @ivar = Concurrent::IVar.new
   end
@@ -15,7 +13,7 @@ class Kamal::Cli::Healthcheck::Barrier
 
   def wait
     unless opened?
-      raise Kamal::Cli::Healthcheck::Error.new("Halted at barrier")
+      raise Kamal::Cli::BootError.new("Halted at barrier")
     end
   end
 

lib/kamal/cli/app/boot.rb

@@ -1,7 +1,7 @@
 class Kamal::Cli::App::Boot
   attr_reader :host, :role, :version, :barrier, :sshkit
-  delegate :execute, :capture_with_info, :capture_with_pretty_json, :info, :error, :upload!, to: :sshkit
+  delegate :execute, :capture_with_info, :capture_with_pretty_json, :info, :error, to: :sshkit
-  delegate :uses_cord?, :assets?, :running_traefik?, to: :role
+  delegate :assets?, :running_proxy?, to: :role
 
   def initialize(host, role, sshkit, version, barrier)
     @host = host
@@ -46,23 +46,11 @@ class Kamal::Cli::App::Boot
     def start_new_version
       audit "Booted app version #{version}"
       hostname = "#{host.to_s[0...51].gsub(/\.+$/, '')}-#{SecureRandom.hex(6)}"
-
+      execute *app.run(hostname: hostname)
-      execute *app.ensure_env_directory
+      if running_proxy?
-      upload! role.secrets_io(host), role.secrets_path, mode: "0600"
+        endpoint = capture_with_info(*app.container_endpoint(version: version)).strip
-
-      if proxy_host?
-        execute *app.run_for_proxy(hostname: hostname)
-        if running_traefik?
-          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 *KAMAL.proxy.deploy(role.container_prefix, target: endpoint)
-        else
-          Kamal::Cli::Healthcheck::Poller.wait_for_healthy(pause_after_ready: true) { capture_with_info(*app.status(version: version)) }
-        end
-      else
-        execute *app.tie_cord(role.cord_host_file) if uses_cord?
-        execute *app.run(hostname: hostname)
-        Kamal::Cli::Healthcheck::Poller.wait_for_healthy(pause_after_ready: true) { capture_with_info(*app.status(version: version)) }
       end
     end
 
@@ -71,22 +59,13 @@ class Kamal::Cli::App::Boot
     end
 
     def stop_old_version(version)
-      if uses_cord? && !proxy_host?
-        cord = capture_with_info(*app.cord(version: version), raise_on_non_zero_exit: false).strip
-        if cord.present?
-          execute *app.cut_cord(cord)
-          Kamal::Cli::Healthcheck::Poller.wait_for_unhealthy(pause_after_ready: true) { capture_with_info(*app.status(version: version)) }
-        end
-      end
-
       execute *app.stop(version: version), raise_on_non_zero_exit: false
-
       execute *app.clean_up_assets if assets?
     end
 
     def release_barrier
       if barrier.open
-        info "First #{KAMAL.primary_role} container is healthy on #{host}, booting any other roles"
+        info "First #{KAMAL.primary_role} container is healthy on #{host}, booting other roles"
       end
     end
 
@@ -94,20 +73,15 @@ class Kamal::Cli::App::Boot
       info "Waiting for the first healthy #{KAMAL.primary_role} container before booting #{role} on #{host}..."
       barrier.wait
       info "First #{KAMAL.primary_role} container is healthy, booting #{role} on #{host}..."
-    rescue Kamal::Cli::Healthcheck::Error
+    rescue Kamal::Cli::BootError
       info "First #{KAMAL.primary_role} container is unhealthy, not booting #{role} on #{host}"
       raise
     end
 
     def close_barrier
       if barrier.close
-        info "First #{KAMAL.primary_role} container is unhealthy on #{host}, not booting any other roles"
+        info "First #{KAMAL.primary_role} container is unhealthy on #{host}, not booting other roles"
-        begin
         error capture_with_info(*app.logs(version: version))
-          error capture_with_info(*app.container_health_log(version: version))
-        rescue SSHKit::Command::Failed
-          error "Could not fetch logs for #{version}"
-        end
       end
     end
 
@@ -134,8 +108,4 @@ class Kamal::Cli::App::Boot
     def queuer?
       barrier && !barrier_role?
     end
-
-    def proxy_host?
-      KAMAL.proxy_host?(host)
-    end
 end

lib/kamal/cli/base.rb

@@ -1,12 +1,12 @@
 require "thor"
+require "dotenv"
 require "kamal/sshkit_with_ext"
 
 module Kamal::Cli
   class Base < Thor
     include SSHKit::DSL
 
-    def self.exit_on_failure?() false end
+    def self.exit_on_failure?() true end
-    def self.dynamic_command_class() Kamal::Cli::Alias::Command end
 
     class_option :verbose, type: :boolean, aliases: "-v", desc: "Detailed logging"
     class_option :quiet, type: :boolean, aliases: "-q", desc: "Minimal logging"
@@ -22,23 +22,33 @@ module Kamal::Cli
 
     class_option :skip_hooks, aliases: "-H", type: :boolean, default: false, desc: "Don't run hooks"
 
-    def initialize(args = [], local_options = {}, config = {})
+    def initialize(*)
-      if config[:current_command].is_a?(Kamal::Cli::Alias::Command)
-        # When Thor generates a dynamic command, it doesn't attempt to parse the arguments.
-        # For our purposes, it means the arguments are passed in args rather than local_options.
-        super([], args, config)
-      else
       super
-      end
+      @original_env = ENV.to_h.dup
-      initialize_commander unless KAMAL.configured?
+      load_envs
+      initialize_commander(options_with_subcommand_class_options)
     end
 
     private
+      def load_envs
+        if destination = options[:destination]
+          Dotenv.load(".env.#{destination}", ".env")
+        else
+          Dotenv.load(".env")
+        end
+      end
+
+      def reload_envs
+        ENV.clear
+        ENV.update(@original_env)
+        load_envs
+      end
+
       def options_with_subcommand_class_options
         options.merge(@_initializer.last[:class_options] || {})
       end
 
-      def initialize_commander
+      def initialize_commander(options)
         KAMAL.tap do |commander|
           if options[:verbose]
             ENV["VERBOSE"] = "1" # For backtraces via cli/start
@@ -73,6 +83,8 @@ module Kamal::Cli
         if KAMAL.holding_lock?
           yield
         else
+          ensure_run_and_locks_directory
+
           acquire_lock
 
           begin
@@ -101,8 +113,6 @@ module Kamal::Cli
       end
 
       def acquire_lock
-        ensure_run_and_locks_directory
-
         raise_if_locked do
           say "Acquiring the deploy lock...", :magenta
           on(KAMAL.primary_host) { execute *KAMAL.lock.acquire("Automatic deploy lock", KAMAL.config.version), verbosity: :debug }

lib/kamal/cli/build.rb

@@ -30,48 +30,43 @@ class Kamal::Cli::Build < Kamal::Cli::Base
       say "Building with uncommitted changes:\n #{uncommitted_changes}", :yellow
     end
 
-    run_locally do
-      begin
-        execute *KAMAL.builder.inspect_builder
-      rescue SSHKit::Command::Failed => e
-        if e.message =~ /(context not found|no builder|no compatible builder|does not exist)/
-          warn "Missing compatible builder, so creating a new one first"
-          begin
-            cli.remove
-          rescue SSHKit::Command::Failed
-            raise unless e.message =~ /(context not found|no builder|does not exist)/
-          end
-          cli.create
-        else
-          raise
-        end
-      end
-
     # Get the command here to ensure the Dir.chdir doesn't interfere with it
     push = KAMAL.builder.push
 
+    run_locally do
+      begin
         KAMAL.with_verbosity(:debug) do
-        Dir.chdir(KAMAL.config.builder.build_directory) { execute *push, env: KAMAL.config.builder.secrets }
+          Dir.chdir(KAMAL.config.builder.build_directory) { execute *push }
+        end
+      rescue SSHKit::Command::Failed => e
+        if e.message =~ /(no builder)|(no such file or directory)/
+          warn "Missing compatible builder, so creating a new one first"
+
+          if cli.create
+            KAMAL.with_verbosity(:debug) do
+              Dir.chdir(KAMAL.config.builder.build_directory) { execute *push }
+            end
+          end
+        else
+          raise
+        end
       end
     end
   end
 
   desc "pull", "Pull app image from registry onto servers"
   def pull
-    if (first_hosts = mirror_hosts).any?
+    on(KAMAL.hosts) do
-      #  Pull on a single host per mirror first to seed them
+      execute *KAMAL.auditor.record("Pulled image with version #{KAMAL.config.version}"), verbosity: :debug
-      say "Pulling image on #{first_hosts.join(", ")} to seed the #{"mirror".pluralize(first_hosts.count)}...", :magenta
+      execute *KAMAL.builder.clean, raise_on_non_zero_exit: false
-      pull_on_hosts(first_hosts)
+      execute *KAMAL.builder.pull
-      say "Pulling image on remaining hosts...", :magenta
+      execute *KAMAL.builder.validate_image
-      pull_on_hosts(KAMAL.hosts - first_hosts)
-    else
-      pull_on_hosts(KAMAL.hosts)
     end
   end
 
   desc "create", "Create a build setup"
   def create
-    if (remote_host = KAMAL.config.builder.remote)
+    if (remote_host = KAMAL.config.builder.remote_host)
       connect_to_remote_host(remote_host)
     end
 
@@ -133,28 +128,4 @@ class Kamal::Cli::Build < Kamal::Cli::Base
         end
       end
     end
-
-    def mirror_hosts
-      if KAMAL.hosts.many?
-        mirror_hosts = Concurrent::Hash.new
-        on(KAMAL.hosts) do |host|
-          first_mirror = capture_with_info(*KAMAL.builder.first_mirror).strip.presence
-          mirror_hosts[first_mirror] ||= host.to_s if first_mirror
-        rescue SSHKit::Command::Failed => e
-          raise unless e.message =~ /error calling index: reflect: slice index out of range/
-        end
-        mirror_hosts.values
-      else
-        []
-      end
-    end
-
-    def pull_on_hosts(hosts)
-      on(hosts) do
-        execute *KAMAL.auditor.record("Pulled image with version #{KAMAL.config.version}"), verbosity: :debug
-        execute *KAMAL.builder.clean, raise_on_non_zero_exit: false
-        execute *KAMAL.builder.pull
-        execute *KAMAL.builder.validate_image
-      end
-    end
 end

lib/kamal/cli/env.rb

@@ -0,0 +1,45 @@
+require "tempfile"
+
+class Kamal::Cli::Env < Kamal::Cli::Base
+  desc "push", "Push the env file to the remote hosts"
+  def push
+    with_lock do
+      on(KAMAL.hosts) do
+        execute *KAMAL.auditor.record("Pushed env files"), verbosity: :debug
+
+        KAMAL.roles_on(host).each do |role|
+          execute *KAMAL.app(role: role, host: host).make_env_directory
+          upload! role.env(host).secrets_io, role.env(host).secrets_file, mode: 400
+        end
+      end
+
+      on(KAMAL.accessory_hosts) do
+        KAMAL.accessories_on(host).each do |accessory|
+          accessory_config = KAMAL.config.accessory(accessory)
+          execute *KAMAL.accessory(accessory).make_env_directory
+          upload! accessory_config.env.secrets_io, accessory_config.env.secrets_file, mode: 400
+        end
+      end
+    end
+  end
+
+  desc "delete", "Delete the env file from the remote hosts"
+  def delete
+    with_lock do
+      on(KAMAL.hosts) do
+        execute *KAMAL.auditor.record("Deleted env files"), verbosity: :debug
+
+        KAMAL.roles_on(host).each do |role|
+          execute *KAMAL.app(role: role, host: host).remove_env_file
+        end
+      end
+
+      on(KAMAL.accessory_hosts) do
+        KAMAL.accessories_on(host).each do |accessory|
+          accessory_config = KAMAL.config.accessory(accessory)
+          execute *KAMAL.accessory(accessory).remove_env_file
+        end
+      end
+    end
+  end
+end

lib/kamal/cli/healthcheck/error.rb

@@ -1,2 +0,0 @@
-class Kamal::Cli::Healthcheck::Error < StandardError
-end

lib/kamal/cli/healthcheck/poller.rb

@@ -1,63 +0,0 @@
-module Kamal::Cli::Healthcheck::Poller
-  extend self
-
-  TRAEFIK_UPDATE_DELAY = 5
-
-
-  def wait_for_healthy(pause_after_ready: false, &block)
-    attempt = 1
-    max_attempts = KAMAL.config.healthcheck.max_attempts
-
-    begin
-      case status = block.call
-      when "healthy"
-        sleep TRAEFIK_UPDATE_DELAY if pause_after_ready
-      when "running" # No health check configured
-        sleep KAMAL.config.readiness_delay if pause_after_ready
-      else
-        raise Kamal::Cli::Healthcheck::Error, "container not ready (#{status})"
-      end
-    rescue Kamal::Cli::Healthcheck::Error => e
-      if attempt <= max_attempts
-        info "#{e.message}, retrying in #{attempt}s (attempt #{attempt}/#{max_attempts})..."
-        sleep attempt
-        attempt += 1
-        retry
-      else
-        raise
-      end
-    end
-
-    info "Container is healthy!"
-  end
-
-  def wait_for_unhealthy(pause_after_ready: false, &block)
-    attempt = 1
-    max_attempts = KAMAL.config.healthcheck.max_attempts
-
-    begin
-      case status = block.call
-      when "unhealthy"
-        sleep TRAEFIK_UPDATE_DELAY if pause_after_ready
-      else
-        raise Kamal::Cli::Healthcheck::Error, "container not unhealthy (#{status})"
-      end
-    rescue Kamal::Cli::Healthcheck::Error => e
-      if attempt <= max_attempts
-        info "#{e.message}, retrying in #{attempt}s (attempt #{attempt}/#{max_attempts})..."
-        sleep attempt
-        attempt += 1
-        retry
-      else
-        raise
-      end
-    end
-
-    info "Container is unhealthy!"
-  end
-
-  private
-    def info(message)
-      SSHKit.config.output.info(message)
-    end
-end

lib/kamal/cli/lock.rb

@@ -3,6 +3,7 @@ class Kamal::Cli::Lock < Kamal::Cli::Base
   def status
     handle_missing_lock do
       on(KAMAL.primary_host) do
+        execute *KAMAL.server.ensure_run_directory
         puts capture_with_debug(*KAMAL.lock.status)
       end
     end
@@ -12,10 +13,9 @@ class Kamal::Cli::Lock < Kamal::Cli::Base
   option :message, aliases: "-m", type: :string, desc: "A lock message", required: true
   def acquire
     message = options[:message]
-    ensure_run_and_locks_directory
-
     raise_if_locked do
       on(KAMAL.primary_host) do
+        execute *KAMAL.server.ensure_run_directory
         execute *KAMAL.lock.acquire(message, KAMAL.config.version), verbosity: :debug
       end
       say "Acquired the deploy lock"
@@ -26,6 +26,7 @@ class Kamal::Cli::Lock < Kamal::Cli::Base
   def release
     handle_missing_lock do
       on(KAMAL.primary_host) do
+        execute *KAMAL.server.ensure_run_directory
         execute *KAMAL.lock.release, verbosity: :debug
       end
       say "Released the deploy lock"

lib/kamal/cli/main.rb

@@ -9,6 +9,9 @@ class Kamal::Cli::Main < Kamal::Cli::Base
         say "Ensure Docker is installed...", :magenta
         invoke "kamal:cli:server:bootstrap", [], invoke_options
 
+        say "Evaluate and push env files...", :magenta
+        invoke "kamal:cli:main:envify", [], invoke_options
+
         invoke "kamal:cli:accessory:boot", [ "all" ], invoke_options
         deploy
       end
@@ -22,7 +25,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
       invoke_options = deploy_options
 
       say "Log into image registry...", :magenta
-      invoke "kamal:cli:registry:login", [], invoke_options.merge(skip_local: options[:skip_push])
+      invoke "kamal:cli:registry:login", [], invoke_options
 
       if options[:skip_push]
         say "Pull app image...", :magenta
@@ -33,15 +36,10 @@ class Kamal::Cli::Main < Kamal::Cli::Base
       end
 
       with_lock do
-        run_hook "pre-deploy", secrets: true
+        run_hook "pre-deploy"
 
-        if KAMAL.config.proxy.enabled?
+        say "Ensure proxy is running...", :magenta
-          say "Ensure Traefik/kamal-proxy is running...", :magenta
         invoke "kamal:cli:proxy:boot", [], invoke_options
-        else
-          say "Ensure Traefik is running...", :magenta
-          invoke "kamal:cli:traefik:boot", [], invoke_options
-        end
 
         say "Detect stale containers...", :magenta
         invoke "kamal:cli:app:stale_containers", [], invoke_options.merge(stop: true)
@@ -53,10 +51,10 @@ class Kamal::Cli::Main < Kamal::Cli::Base
       end
     end
 
-    run_hook "post-deploy", secrets: true, runtime: runtime.round
+    run_hook "post-deploy", runtime: runtime.round
   end
 
-  desc "redeploy", "Deploy app to servers without bootstrapping servers, starting Traefik, pruning, and registry login"
+  desc "redeploy", "Deploy app to servers without bootstrapping servers, starting proxy, pruning, and registry login"
   option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip image build and push"
   def redeploy
     runtime = print_runtime do
@@ -71,7 +69,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
       end
 
       with_lock do
-        run_hook "pre-deploy", secrets: true
+        run_hook "pre-deploy"
 
         say "Detect stale containers...", :magenta
         invoke "kamal:cli:app:stale_containers", [], invoke_options.merge(stop: true)
@@ -80,7 +78,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
       end
     end
 
-    run_hook "post-deploy", secrets: true, runtime: runtime.round
+    run_hook "post-deploy", runtime: runtime.round
   end
 
   desc "rollback [VERSION]", "Rollback app to VERSION"
@@ -94,7 +92,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
         old_version = nil
 
         if container_available?(version)
-          run_hook "pre-deploy", secrets: true
+          run_hook "pre-deploy"
 
           invoke "kamal:cli:app:boot", [], invoke_options.merge(version: version)
           rolled_back = true
@@ -104,16 +102,12 @@ class Kamal::Cli::Main < Kamal::Cli::Base
       end
     end
 
-    run_hook "post-deploy", secrets: true, runtime: runtime.round if rolled_back
+    run_hook "post-deploy", runtime: runtime.round if rolled_back
   end
 
   desc "details", "Show details about all containers"
   def details
-    if KAMAL.config.proxy.enabled?
     invoke "kamal:cli:proxy:details"
-    else
-      invoke "kamal:cli:traefik:details"
-    end
     invoke "kamal:cli:app:details"
     invoke "kamal:cli:accessory:details", [ "all" ]
   end
@@ -132,18 +126,6 @@ class Kamal::Cli::Main < Kamal::Cli::Base
     end
   end
 
-  desc "docs", "Show Kamal documentation for configuration setting"
-  def docs(section = nil)
-    case section
-    when NilClass
-      puts Kamal::Configuration.validation_doc
-    else
-      puts Kamal::Configuration.const_get(section.titlecase.to_sym).validation_doc
-    end
-  rescue NameError
-    puts "No documentation found for #{section}"
-  end
-
   desc "init", "Create config stub in config/deploy.yml and env stub in .env"
   option :bundle, type: :boolean, default: false, desc: "Add Kamal to the Gemfile and create a bin/kamal binstub"
   def init
@@ -157,10 +139,9 @@ 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?
+    unless (deploy_file = Pathname.new(File.expand_path(".env"))).exist?
-      FileUtils.mkdir_p secrets_file.dirname
+      FileUtils.cp_r Pathname.new(File.expand_path("templates/template.env", __dir__)), deploy_file
-      FileUtils.cp_r Pathname.new(File.expand_path("templates/secrets", __dir__)), secrets_file
+      puts "Created .env file"
-      puts "Created .kamal/secrets file"
     end
 
     unless (hooks_dir = Pathname.new(File.expand_path(".kamal/hooks"))).exist?
@@ -185,19 +166,38 @@ class Kamal::Cli::Main < Kamal::Cli::Base
     end
   end
 
-  desc "remove", "Remove Traefik, app, accessories, and registry session from servers"
+  desc "envify", "Create .env by evaluating .env.erb (or .env.staging.erb -> .env.staging when using -d staging)"
+  option :skip_push, aliases: "-P", type: :boolean, default: false, desc: "Skip .env file push"
+  def envify
+    if destination = options[:destination]
+      env_template_path = ".env.#{destination}.erb"
+      env_path          = ".env.#{destination}"
+    else
+      env_template_path = ".env.erb"
+      env_path          = ".env"
+    end
+
+    if Pathname.new(File.expand_path(env_template_path)).exist?
+      File.write(env_path, ERB.new(File.read(env_template_path), trim_mode: "-").result, perm: 0600)
+
+      unless options[:skip_push]
+        reload_envs
+        invoke "kamal:cli:env:push", options
+      end
+    else
+      puts "Skipping envify (no #{env_template_path} exist)"
+    end
+  end
+
+  desc "remove", "Remove proxy, app, accessories, and registry session from servers"
   option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
   def remove
     confirming "This will remove all containers and images. Are you sure?" do
       with_lock do
-        if KAMAL.config.proxy.enabled?
         invoke "kamal:cli:proxy:remove", [], options.without(:confirmed)
-        else
-          invoke "kamal:cli:traefik:remove", [], options.without(:confirmed)
-        end
         invoke "kamal:cli:app:remove", [], options.without(:confirmed)
         invoke "kamal:cli:accessory:remove", [ "all" ], options
-        invoke "kamal:cli:registry:logout", [], options.without(:confirmed).merge(skip_local: true)
+        invoke "kamal:cli:registry:logout", [], options.without(:confirmed)
       end
     end
   end
@@ -216,26 +216,23 @@ class Kamal::Cli::Main < Kamal::Cli::Base
   desc "build", "Build application image"
   subcommand "build", Kamal::Cli::Build
 
+  desc "env", "Manage environment files"
+  subcommand "env", Kamal::Cli::Env
+
   desc "lock", "Manage the deploy lock"
   subcommand "lock", Kamal::Cli::Lock
 
-  desc "proxy", "Prune old application images and containers"
-  subcommand "proxy", Kamal::Cli::Proxy
-
   desc "prune", "Prune old application images and containers"
   subcommand "prune", Kamal::Cli::Prune
 
   desc "registry", "Login and -out of the image registry"
   subcommand "registry", Kamal::Cli::Registry
 
-  desc "secrets", "Helpers for extracting secrets"
-  subcommand "secrets", Kamal::Cli::Secrets
-
   desc "server", "Bootstrap servers with curl and Docker"
   subcommand "server", Kamal::Cli::Server
 
-  desc "traefik", "Manage Traefik load balancer"
+  desc "proxy", "Manage load balancer proxy"
-  subcommand "traefik", Kamal::Cli::Traefik
+  subcommand "proxy", Kamal::Cli::Proxy
 
   private
     def container_available?(version)

lib/kamal/cli/proxy.rb

@@ -1,23 +1,10 @@
 class Kamal::Cli::Proxy < Kamal::Cli::Base
   desc "boot", "Boot proxy on servers"
   def boot
-    raise_unless_kamal_proxy_enabled!
     with_lock do
-      on(KAMAL.hosts) do |host|
+      on(KAMAL.proxy_hosts) do
-        execute *KAMAL.docker.create_network
-      rescue SSHKit::Command::Failed => e
-        raise unless e.message.include?("already exists")
-      end
-
-      on(KAMAL.traefik_hosts) do |host|
         execute *KAMAL.registry.login
-        if KAMAL.proxy_host?(host)
         execute *KAMAL.proxy.start_or_run
-        else
-          execute *KAMAL.traefik.ensure_env_directory
-          upload! KAMAL.traefik.secrets_io, KAMAL.traefik.secrets_path, mode: "0600"
-          execute *KAMAL.traefik.start_or_run
-        end
       end
     end
   end
@@ -26,119 +13,100 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
   option :rolling, type: :boolean, default: false, desc: "Reboot proxy on hosts in sequence, rather than in parallel"
   option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
   def reboot
-    raise_unless_kamal_proxy_enabled!
     confirming "This will cause a brief outage on each host. Are you sure?" do
       with_lock do
-        host_groups = options[:rolling] ? KAMAL.traefik_hosts : [ KAMAL.traefik_hosts ]
+        host_groups = options[:rolling] ? KAMAL.proxy_hosts : [ KAMAL.proxy_hosts ]
         host_groups.each do |hosts|
           host_list = Array(hosts).join(",")
-          run_hook "pre-traefik-reboot", hosts: host_list
+          run_hook "pre-proxy-reboot", hosts: host_list
-          on(hosts) do |host|
+          on(hosts) do
             execute *KAMAL.auditor.record("Rebooted proxy"), verbosity: :debug
             execute *KAMAL.registry.login
-
-            "Stopping and removing Traefik on #{host}, if running..."
-            execute *KAMAL.traefik.stop, raise_on_non_zero_exit: false
-            execute *KAMAL.traefik.remove_container
-
-            "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.run
-            execute *KAMAL.traefik_or_proxy(host).run
-
-            if KAMAL.proxy_host?(host)
-              KAMAL.roles_on(host).select(&:running_traefik?).each do |role|
-                app = KAMAL.app(role: role, host: host)
-
-                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?
-                  info "Deploying #{endpoint} for role `#{role}` on #{host}..."
-                  execute *KAMAL.proxy.deploy(role.container_prefix, target: endpoint)
           end
+          run_hook "post-proxy-reboot", hosts: host_list
         end
       end
     end
-          run_hook "post-traefik-reboot", hosts: host_list
-        end
-      end
-    end
-  end
-
-  desc "upgrade", "Upgrade to correct proxy on servers (stop container, remove container, start new container)"
-  option :rolling, type: :boolean, default: false, desc: "Reboot proxy on hosts in sequence, rather than in parallel"
-  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
-  def upgrade
-    invoke_options = { "version" => KAMAL.config.version }.merge(options)
-
-    raise_unless_kamal_proxy_enabled!
-    confirming "This will cause a brief outage on each host. Are you sure?" do
-      host_groups = options[:rolling] ? KAMAL.hosts : [ KAMAL.hosts ]
-      host_groups.each do |hosts|
-        host_list = Array(hosts).join(",")
-        run_hook "pre-traefik-reboot", hosts: host_list
-        on(hosts) do |host|
-          execute *KAMAL.auditor.record("Rebooted proxy"), verbosity: :debug
-          execute *KAMAL.registry.login
-
-          "Stopping and removing Traefik on #{host}, if running..."
-          execute *KAMAL.traefik.stop, raise_on_non_zero_exit: false
-          execute *KAMAL.traefik.remove_container
-
-          "Stopping and removing kamal-proxy on #{host}, if running..."
-          execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
-          execute *KAMAL.proxy.remove_container
-        end
-
-        invoke "kamal:cli:proxy:boot", [], invoke_options.merge("hosts" => host_list)
-        reset_invocation(Kamal::Cli::Proxy)
-        invoke "kamal:cli:app:boot", [], invoke_options.merge("hosts" => host_list, version: KAMAL.config.latest_tag)
-        reset_invocation(Kamal::Cli::App)
-        invoke "kamal:cli:prune:all", [], invoke_options.merge("hosts" => host_list)
-        reset_invocation(Kamal::Cli::Prune)
-
-        run_hook "post-traefik-reboot", hosts: host_list
-      end
-    end
   end
 
   desc "start", "Start existing proxy container on servers"
   def start
-    raise_unless_kamal_proxy_enabled!
     with_lock do
-      on(KAMAL.traefik_hosts) do |host|
+      on(KAMAL.proxy_hosts) do
         execute *KAMAL.auditor.record("Started proxy"), verbosity: :debug
-        execute *KAMAL.traefik_or_proxy(host).start
+        execute *KAMAL.proxy.start
       end
     end
   end
 
   desc "stop", "Stop existing proxy container on servers"
   def stop
-    raise_unless_kamal_proxy_enabled!
     with_lock do
-      on(KAMAL.traefik_hosts) do |host|
+      on(KAMAL.proxy_hosts) do
         execute *KAMAL.auditor.record("Stopped proxy"), verbosity: :debug
-        execute *KAMAL.traefik_or_proxy(host).stop, raise_on_non_zero_exit: false
+        execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
       end
     end
   end
 
   desc "restart", "Restart existing proxy container on servers"
   def restart
-    raise_unless_kamal_proxy_enabled!
     with_lock do
       stop
       start
     end
   end
 
+  desc "update", "Update from Traefik to kamal-proxy, for when moving from Kamal v1 to Kamal v2"
+  option :rolling, type: :boolean, default: false, desc: "Reboot proxy on hosts in sequence, rather than in parallel"
+  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
+  def update
+    confirming "This will cause a brief outage on each host. Are you sure?" do
+      with_lock do
+        host_groups = options[:rolling] ? KAMAL.proxy_hosts : [ KAMAL.proxy_hosts ]
+        host_groups.each do |hosts|
+          host_list = Array(hosts).join(",")
+          run_hook "pre-proxy-reboot", hosts: host_list
+          on(hosts) do
+            info "Updating proxy from Traefik to kamal-proxy on #{host}..."
+            execute *KAMAL.auditor.record("Updated proxy from Traefik to kamal-proxy"), verbosity: :debug
+            execute *KAMAL.registry.login
+
+            info "Stopping and removing Traefik on #{host}..."
+            execute *KAMAL.proxy.stop(name: "traefik"), raise_on_non_zero_exit: false
+            execute *KAMAL.proxy.remove_container(filter: "label=org.opencontainers.image.title=traefik")
+            execute *KAMAL.proxy.remove_image(filter: "label=org.opencontainers.image.title=traefik")
+
+            info "Stopping and removing kamal-proxy on #{host}, if running..."
+            execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
+            execute *KAMAL.proxy.remove_container
+
+            info "Starting kamal-proxy on #{host}..."
+            execute *KAMAL.proxy.run
+
+            KAMAL.roles_on(host).select(&:running_proxy?).each do |role|
+              app = KAMAL.app(role: role, host: host)
+
+              version = capture_with_info(*app.current_running_version, raise_on_non_zero_exit: false).strip
+              endpoint = capture_with_info(*app.container_endpoint(version: version)).strip
+              raise Kamal::Cli::BootError, "Failed to get endpoint for #{role} on #{host}, is the app container running?" if endpoint.empty?
+
+              info "Deploying #{endpoint} for role `#{role}` on #{host}..."
+              execute *KAMAL.proxy.deploy(role.container_prefix, target: endpoint)
+            end
+          end
+          run_hook "post-proxy-reboot", hosts: host_list
+        end
+      end
+    end
+  end
+
   desc "details", "Show details about proxy container from servers"
   def details
-    raise_unless_kamal_proxy_enabled!
+    on(KAMAL.proxy_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.proxy.info), type: "Proxy" }
-    on(KAMAL.traefik_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.traefik_or_proxy(host).info), type: "Proxy" }
   end
 
   desc "logs", "Show log lines from proxy on servers"
@@ -147,28 +115,26 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
   option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
   option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
   def logs
-    raise_unless_kamal_proxy_enabled!
     grep = options[:grep]
 
     if options[:follow]
       run_locally do
         info "Following logs on #{KAMAL.primary_host}..."
-        info KAMAL.traefik_or_proxy(KAMAL.primary_host).follow_logs(host: KAMAL.primary_host, grep: grep)
+        info KAMAL.proxy.follow_logs(host: KAMAL.primary_host, grep: grep)
-        exec KAMAL.traefik_or_proxy(KAMAL.primary_host).follow_logs(host: KAMAL.primary_host, grep: grep)
+        exec KAMAL.proxy.follow_logs(host: KAMAL.primary_host, 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.traefik_hosts) do |host|
+      on(KAMAL.proxy_hosts) do |host|
-        puts_by_host host, capture(*KAMAL.traefik_or_proxy(host).logs(since: since, lines: lines, grep: grep)), type: "Proxy"
+        puts_by_host host, capture(*KAMAL.proxy.logs(since: since, lines: lines, grep: grep)), type: "Proxy"
       end
     end
   end
 
   desc "remove", "Remove proxy container and image from servers"
   def remove
-    raise_unless_kamal_proxy_enabled!
     with_lock do
       stop
       remove_container
@@ -178,36 +144,21 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
 
   desc "remove_container", "Remove proxy container from servers", hide: true
   def remove_container
-    raise_unless_kamal_proxy_enabled!
     with_lock do
-      on(KAMAL.traefik_hosts) do
+      on(KAMAL.proxy_hosts) do
         execute *KAMAL.auditor.record("Removed proxy container"), verbosity: :debug
         execute *KAMAL.proxy.remove_container
-        execute *KAMAL.traefik.remove_container
       end
     end
   end
 
   desc "remove_image", "Remove proxy image from servers", hide: true
   def remove_image
-    raise_unless_kamal_proxy_enabled!
     with_lock do
-      on(KAMAL.traefik_hosts) do
+      on(KAMAL.proxy_hosts) do
         execute *KAMAL.auditor.record("Removed proxy image"), verbosity: :debug
         execute *KAMAL.proxy.remove_image
-        execute *KAMAL.traefik.remove_image
       end
     end
   end
-
-  private
-    def raise_unless_kamal_proxy_enabled!
-      unless KAMAL.config.proxy.enabled?
-        raise "kamal proxy commands are disabled unless experimental proxy support is enabled. Use `kamal traefik` commands instead."
-      end
-    end
-
-    def reset_invocation(cli_class)
-      instance_variable_get("@_invocations")[cli_class].pop
-    end
 end

lib/kamal/cli/prune.rb

@@ -28,7 +28,6 @@ class Kamal::Cli::Prune < Kamal::Cli::Base
       on(KAMAL.hosts) do
         execute *KAMAL.auditor.record("Pruned containers"), verbosity: :debug
         execute *KAMAL.prune.app_containers(retain: retain)
-        execute *KAMAL.prune.healthcheck_containers
       end
     end
   end

lib/kamal/cli/registry.rb

@@ -1,17 +1,18 @@
 class Kamal::Cli::Registry < Kamal::Cli::Base
   desc "login", "Log in to registry locally and remotely"
-  option :skip_local, aliases: "-L", type: :boolean, default: false, desc: "Skip local login"
-  option :skip_remote, aliases: "-R", type: :boolean, default: false, desc: "Skip remote login"
   def login
-    run_locally    { execute *KAMAL.registry.login } unless options[:skip_local]
+    run_locally    { execute *KAMAL.registry.login }
-    on(KAMAL.hosts) { execute *KAMAL.registry.login } unless options[:skip_remote]
+    on(KAMAL.hosts) { execute *KAMAL.registry.login }
+  # FIXME: This rescue needed?
+  rescue ArgumentError => e
+    puts e.message
   end
 
-  desc "logout", "Log out of registry locally and remotely"
+  desc "logout", "Log out of registry remotely"
-  option :skip_local, aliases: "-L", type: :boolean, default: false, desc: "Skip local login"
-  option :skip_remote, aliases: "-R", type: :boolean, default: false, desc: "Skip remote login"
   def logout
-    run_locally    { execute *KAMAL.registry.logout } unless options[:skip_local]
+    on(KAMAL.hosts) { execute *KAMAL.registry.logout }
-    on(KAMAL.hosts) { execute *KAMAL.registry.logout } unless options[:skip_remote]
+  # FIXME: This rescue needed?
+  rescue ArgumentError => e
+    puts e.message
   end
 end

lib/kamal/cli/secrets.rb

@@ -1,47 +0,0 @@
-class Kamal::Cli::Secrets < Kamal::Cli::Base
-  desc "fetch [SECRETS...]", "Fetch secrets from a vault"
-  option :adapter, type: :string, aliases: "-a", required: true, desc: "Which vault adapter to use"
-  option :account, type: :string, required: true, desc: "The account identifier or username"
-  option :from, type: :string, required: false, desc: "A vault or folder to fetch the secrets from"
-  option :inline, type: :boolean, required: false, hidden: true
-  def fetch(*secrets)
-    handle_output(inline: options[:inline]) do
-      results = adapter(options[:adapter]).fetch(secrets, **options.slice(:account, :from).symbolize_keys)
-      JSON.dump(results).shellescape
-    end
-  end
-
-  desc "extract", "Extract a single secret from the results of a fetch call"
-  option :inline, type: :boolean, required: false, hidden: true
-  def extract(name, secrets)
-    handle_output(inline: options[:inline]) do
-      parsed_secrets = JSON.parse(secrets)
-
-      value = parsed_secrets[name] || parsed_secrets.find { |k, v| k.end_with?("/#{name}") }&.last
-
-      raise "Could not find secret #{name}" if value.nil?
-
-      value
-    end
-  end
-
-  private
-    def adapter(adapter)
-      Kamal::Secrets::Adapters.lookup(adapter)
-    end
-
-    def handle_output(inline: nil)
-      yield.tap do |output|
-        puts output unless inline
-      end
-    rescue => e
-      handle_error(e)
-    end
-
-    def handle_error(e)
-      $stderr.puts "  \e[31mERROR (#{e.class}): #{e.message}\e[0m"
-      $stderr.puts e.backtrace if ENV["VERBOSE"]
-
-      exit 1
-    end
-end

lib/kamal/cli/server.rb

@@ -1,8 +1,7 @@
 class Kamal::Cli::Server < Kamal::Cli::Base
   desc "exec", "Run a custom command on the server (use --help to show options)"
   option :interactive, type: :boolean, aliases: "-i", default: false, desc: "Run the command interactively (use for console/bash)"
-  def exec(*cmd)
+  def exec(cmd)
-    cmd = Kamal::Utils.join_commands(cmd)
     hosts = KAMAL.hosts | KAMAL.accessory_hosts
 
     case

lib/kamal/cli/templates/deploy.yml

@@ -18,10 +18,6 @@ registry:
   password:
     - KAMAL_REGISTRY_PASSWORD
 
-# Configure builder setup.
-builder:
-  arch: amd64
-
 # Inject ENV variables into containers (secrets come from .env).
 # Remember to run `kamal env push` after making changes!
 # env:
@@ -34,6 +30,16 @@ builder:
 # ssh:
 #   user: app
 
+# Configure builder setup.
+# builder:
+#   args:
+#     RUBY_VERSION: 3.2.0
+#   secrets:
+#     - GITHUB_TOKEN
+#   remote:
+#     arch: amd64
+#     host: ssh://app@192.168.0.1
+
 # Use accessory services (secrets come from .env).
 # accessories:
 #   db:
@@ -57,17 +63,6 @@ builder:
 #     directories:
 #       - data:/data
 
-# Configure custom arguments for Traefik. Be sure to reboot traefik when you modify it.
-# traefik:
-#   args:
-#     accesslog: true
-#     accesslog.format: json
-
-# Configure a custom healthcheck (default is /up on port 3000)
-# healthcheck:
-#   path: /healthz
-#   port: 4000
-
 # Bridge fingerprinted assets, like JS and CSS, between versions to avoid
 # hitting 404 on in-flight requests. Combines all files from new and old
 # version inside the asset_path.

lib/kamal/cli/templates/sample_hooks/docker-setup.sample

@@ -2,12 +2,6 @@
 
 # A sample docker-setup hook
 #
-# Sets up a Docker network on defined hosts which can then be used by the application’s containers
+# Sets up a Docker network which can then be used by the application’s containers
 
-hosts = ENV["KAMAL_HOSTS"].split(",")
+ssh user@example.com docker network create kamal
-
-hosts.each do |ip|
-  destination = "root@#{ip}"
-  puts "Creating a Docker network \"kamal\" on #{destination}"
-  `ssh #{destination} docker network create kamal`
-end

lib/kamal/cli/templates/sample_hooks/post-proxy-reboot.sample

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Rebooted proxy on $KAMAL_HOSTS"

lib/kamal/cli/templates/sample_hooks/post-traefik-reboot.sample

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "Rebooted Traefik on $KAMAL_HOSTS"

lib/kamal/cli/templates/sample_hooks/pre-proxy-reboot.sample

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "Rebooting proxy on $KAMAL_HOSTS..."

lib/kamal/cli/templates/sample_hooks/pre-traefik-reboot.sample

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "Rebooting Traefik on $KAMAL_HOSTS..."

lib/kamal/cli/templates/secrets

@@ -1,16 +0,0 @@
-# WARNING: Avoid adding secrets directly to this file
-# If you must, then add `.kamal/secrets*` to your .gitignore file
-
-# Option 1: Read secrets from the environment
-KAMAL_REGISTRY_PASSWORD=$KAMAL_REGISTRY_PASSWORD
-
-# Option 2: Read secrets via a command
-# RAILS_MASTER_KEY=$(cat config/master.key)
-
-# Option 3: Read secrets via kamal secrets helpers
-# These will handle logging in and fetching the secrets in as few calls as possible
-# There are adapters for 1Password, LastPass + Bitwarden
-#
-# SECRETS=$(kamal secrets fetch --adapter 1password --account my-account --from MyVault/MyItem KAMAL_REGISTRY_PASSWORD RAILS_MASTER_KEY)
-# KAMAL_REGISTRY_PASSWORD=$(kamal secrets extract KAMAL_REGISTRY_PASSWORD $SECRETS)
-# RAILS_MASTER_KEY=$(kamal secrets extract RAILS_MASTER_KEY $SECRETS)

lib/kamal/cli/templates/template.env

@@ -0,0 +1,2 @@
+KAMAL_REGISTRY_PASSWORD=change-this
+RAILS_MASTER_KEY=another-env

lib/kamal/cli/traefik.rb

@@ -1,141 +0,0 @@
-class Kamal::Cli::Traefik < Kamal::Cli::Base
-  desc "boot", "Boot Traefik on servers"
-  def boot
-    raise_if_kamal_proxy_enabled!
-    with_lock do
-      on(KAMAL.traefik_hosts) do
-        execute *KAMAL.registry.login
-        execute *KAMAL.traefik.ensure_env_directory
-        upload! KAMAL.traefik.secrets_io, KAMAL.traefik.secrets_path, mode: "0600"
-        execute *KAMAL.traefik.start_or_run
-      end
-    end
-  end
-
-  desc "reboot", "Reboot Traefik on servers (stop container, remove container, start new container)"
-  option :rolling, type: :boolean, default: false, desc: "Reboot traefik on hosts in sequence, rather than in parallel"
-  option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
-  def reboot
-    raise_if_kamal_proxy_enabled!
-    confirming "This will cause a brief outage on each host. Are you sure?" do
-      with_lock do
-        host_groups = options[:rolling] ? KAMAL.traefik_hosts : [ KAMAL.traefik_hosts ]
-        host_groups.each do |hosts|
-          host_list = Array(hosts).join(",")
-          run_hook "pre-traefik-reboot", hosts: host_list
-          on(hosts) do
-            execute *KAMAL.auditor.record("Rebooted traefik"), verbosity: :debug
-            execute *KAMAL.registry.login
-            execute *KAMAL.traefik.stop, raise_on_non_zero_exit: false
-            execute *KAMAL.traefik.remove_container
-            execute *KAMAL.traefik.run
-          end
-          run_hook "post-traefik-reboot", hosts: host_list
-        end
-      end
-    end
-  end
-
-  desc "start", "Start existing Traefik container on servers"
-  def start
-    raise_if_kamal_proxy_enabled!
-    with_lock do
-      on(KAMAL.traefik_hosts) do
-        execute *KAMAL.auditor.record("Started traefik"), verbosity: :debug
-        execute *KAMAL.traefik.start
-      end
-    end
-  end
-
-  desc "stop", "Stop existing Traefik container on servers"
-  def stop
-    raise_if_kamal_proxy_enabled!
-    with_lock do
-      on(KAMAL.traefik_hosts) do
-        execute *KAMAL.auditor.record("Stopped traefik"), verbosity: :debug
-        execute *KAMAL.traefik.stop, raise_on_non_zero_exit: false
-      end
-    end
-  end
-
-  desc "restart", "Restart existing Traefik container on servers"
-  def restart
-    raise_if_kamal_proxy_enabled!
-    with_lock do
-      stop
-      start
-    end
-  end
-
-  desc "details", "Show details about Traefik container from servers"
-  def details
-    raise_if_kamal_proxy_enabled!
-    on(KAMAL.traefik_hosts) { |host| puts_by_host host, capture_with_info(*KAMAL.traefik.info), type: "Traefik" }
-  end
-
-  desc "logs", "Show log lines from Traefik on servers"
-  option :since, aliases: "-s", desc: "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)"
-  option :lines, type: :numeric, aliases: "-n", desc: "Number of log lines to pull from each server"
-  option :grep, aliases: "-g", desc: "Show lines with grep match only (use this to fetch specific requests by id)"
-  option :grep_options, aliases: "-o", desc: "Additional options supplied to grep"
-  option :follow, aliases: "-f", desc: "Follow logs on primary server (or specific host set by --hosts)"
-  def logs
-    raise_if_kamal_proxy_enabled!
-    grep = options[:grep]
-    grep_options = options[:grep_options]
-
-    if options[:follow]
-      run_locally do
-        info "Following logs on #{KAMAL.primary_host}..."
-        info KAMAL.traefik.follow_logs(host: KAMAL.primary_host, grep: grep, grep_options: grep_options)
-        exec KAMAL.traefik.follow_logs(host: KAMAL.primary_host, grep: grep, grep_options: grep_options)
-      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.traefik_hosts) do |host|
-        puts_by_host host, capture(*KAMAL.traefik.logs(since: since, lines: lines, grep: grep, grep_options: grep_options)), type: "Traefik"
-      end
-    end
-  end
-
-  desc "remove", "Remove Traefik container and image from servers"
-  def remove
-    raise_if_kamal_proxy_enabled!
-    with_lock do
-      stop
-      remove_container
-      remove_image
-    end
-  end
-
-  desc "remove_container", "Remove Traefik container from servers", hide: true
-  def remove_container
-    raise_if_kamal_proxy_enabled!
-    with_lock do
-      on(KAMAL.traefik_hosts) do
-        execute *KAMAL.auditor.record("Removed traefik container"), verbosity: :debug
-        execute *KAMAL.traefik.remove_container
-      end
-    end
-  end
-
-  desc "remove_image", "Remove Traefik image from servers", hide: true
-  def remove_image
-    raise_if_kamal_proxy_enabled!
-    with_lock do
-      on(KAMAL.traefik_hosts) do
-        execute *KAMAL.auditor.record("Removed traefik image"), verbosity: :debug
-        execute *KAMAL.traefik.remove_image
-      end
-    end
-  end
-
-  private
-    def raise_if_kamal_proxy_enabled!
-      if KAMAL.config.proxy.enabled?
-        raise "kamal traefik commands are disabled when experimental proxy support is enabled. Use `kamal proxy` commands instead."
-      end
-    end
-end

lib/kamal/commander.rb

@@ -1,10 +1,9 @@
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/module/delegation"
-require "active_support/core_ext/object/blank"
 
 class Kamal::Commander
   attr_accessor :verbosity, :holding_lock, :connected
-  delegate :hosts, :roles, :primary_host, :primary_role, :roles_on, :traefik_hosts, :proxy_hosts, :proxy_host?, :accessory_hosts, to: :specifics
+  delegate :hosts, :roles, :primary_host, :primary_role, :roles_on, :proxy_hosts, :accessory_hosts, to: :specifics
 
   def initialize
     self.verbosity = :info
@@ -24,20 +23,12 @@ class Kamal::Commander
     @config, @config_kwargs = nil, kwargs
   end
 
-  def configured?
-    @config || @config_kwargs
-  end
-
   attr_reader :specific_roles, :specific_hosts
 
   def specific_primary!
     @specifics = nil
-    if specific_roles.present?
-      self.specific_hosts = [ specific_roles.first.primary_host ]
-    else
     self.specific_hosts = [ config.primary_host ]
   end
-  end
 
   def specific_roles=(role_names)
     @specifics = nil
@@ -94,10 +85,6 @@ class Kamal::Commander
     @docker ||= Kamal::Commands::Docker.new(config)
   end
 
-  def healthcheck
-    @healthcheck ||= Kamal::Commands::Healthcheck.new(config)
-  end
-
   def hook
     @hook ||= Kamal::Commands::Hook.new(config)
   end
@@ -106,10 +93,6 @@ class Kamal::Commander
     @lock ||= Kamal::Commands::Lock.new(config)
   end
 
-  def proxy
-    @proxy ||= Kamal::Commands::Proxy.new(config)
-  end
-
   def prune
     @prune ||= Kamal::Commands::Prune.new(config)
   end
@@ -122,18 +105,10 @@ class Kamal::Commander
     @server ||= Kamal::Commands::Server.new(config)
   end
 
-  def traefik
+  def proxy
-    @traefik ||= Kamal::Commands::Traefik.new(config)
+    @proxy ||= Kamal::Commands::Proxy.new(config)
   end
 
-  def alias(name)
-    config.aliases[name]
-  end
-
-
-  def traefik_or_proxy(host)
-    proxy_host?(host) ? proxy : traefik
-  end
 
   def with_verbosity(level)
     old_level = self.verbosity

lib/kamal/commander/specifics.rb

@@ -18,17 +18,8 @@ class Kamal::Commander::Specifics
     roles.select { |role| role.hosts.include?(host.to_s) }
   end
 
-  def traefik_hosts
-    config.traefik_hosts & specified_hosts
-  end
-
   def proxy_hosts
-    config.proxy_hosts
+    config.proxy_hosts & specified_hosts
-  end
-
-  def proxy_host?(host)
-    host = host.hostname if host.is_a?(SSHKit::Host)
-    proxy_hosts.include?(host)
   end
 
   def accessory_hosts

lib/kamal/commands/accessory.rb

@@ -1,9 +1,7 @@
 class Kamal::Commands::Accessory < Kamal::Commands::Base
   attr_reader :accessory_config
   delegate :service_name, :image, :hosts, :port, :files, :directories, :cmd,
-           :publish_args, :env_args, :volume_args, :label_args, :option_args,
+           :publish_args, :env_args, :volume_args, :label_args, :option_args, to: :accessory_config
-           :secrets_io, :secrets_path, :env_directory,
-           to: :accessory_config
 
   def initialize(config, name:)
     super(config)
@@ -15,7 +13,6 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
       "--name", service_name,
       "--detach",
       "--restart", "unless-stopped",
-      "--network", "kamal",
       *config.logging_args,
       *publish_args,
       *env_args,
@@ -39,17 +36,17 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
   end
 
 
-  def logs(since: nil, lines: nil, grep: nil, grep_options: nil)
+  def logs(since: nil, lines: nil, grep: nil)
     pipe \
       docker(:logs, service_name, (" --since #{since}" if since), (" --tail #{lines}" if lines), "--timestamps", "2>&1"),
-      ("grep '#{grep}'#{" #{grep_options}" if grep_options}" if grep)
+      ("grep '#{grep}'" if grep)
   end
 
-  def follow_logs(grep: nil, grep_options: nil)
+  def follow_logs(grep: nil)
     run_over_ssh \
       pipe \
         docker(:logs, service_name, "--timestamps", "--tail", "10", "--follow", "2>&1"),
-        (%(grep "#{grep}"#{" #{grep_options}" if grep_options}) if grep)
+        (%(grep "#{grep}") if grep)
   end
 
 
@@ -64,7 +61,6 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
     docker :run,
       ("-it" if interactive),
       "--rm",
-      "--network", "kamal",
       *env_args,
       *volume_args,
       image,
@@ -102,8 +98,12 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
     docker :image, :rm, "--force", image
   end
 
-  def ensure_env_directory
+  def make_env_directory
-    make_directory env_directory
+    make_directory accessory_config.env.secrets_directory
+  end
+
+  def remove_env_file
+    [ :rm, "-f", accessory_config.env.secrets_file ]
   end
 
   private

lib/kamal/commands/app.rb

@@ -1,12 +1,10 @@
 class Kamal::Commands::App < Kamal::Commands::Base
-  include Assets, Containers, Cord, Execution, Images, Logging
+  include Assets, Containers, Execution, Images, Logging
 
   ACTIVE_DOCKER_STATUSES = [ :running, :restarting ]
 
   attr_reader :role, :host
 
-  delegate :container_name, to: :role
-
   def initialize(config, role: nil, host: nil)
     super(config)
     @role = role
@@ -22,7 +20,6 @@ class Kamal::Commands::App < Kamal::Commands::Base
       "-e", "KAMAL_CONTAINER_NAME=\"#{container_name}\"",
       "-e", "KAMAL_VERSION=\"#{config.version}\"",
       *role.env_args(host),
-      *role.health_check_args,
       *role.logging_args,
       *config.volume_args,
       *role.asset_volume_args,
@@ -32,25 +29,6 @@ class Kamal::Commands::App < Kamal::Commands::Base
       role.cmd
   end
 
-  def run_for_proxy(hostname: nil)
-    docker :run,
-      "--detach",
-      "--restart unless-stopped",
-      "--name", container_name,
-      "--network", "kamal",
-      *([ "--hostname", hostname ] if hostname),
-      "-e", "KAMAL_CONTAINER_NAME=\"#{container_name}\"",
-      "-e", "KAMAL_VERSION=\"#{config.version}\"",
-      *role.env_args(host),
-      *role.logging_args,
-      *config.volume_args,
-      *role.asset_volume_args,
-      *role.label_args_for_proxy,
-      *role.option_args,
-      config.absolute_image,
-      role.cmd
-  end
-
   def start
     docker :start, container_name
   end
@@ -78,6 +56,10 @@ class Kamal::Commands::App < Kamal::Commands::Base
     container_id_for(container_name: container_name(version), only_running: only_running)
   end
 
+  def container_name(version = nil)
+    [ role.container_prefix, version || config.version ].compact.join("-")
+  end
+
   def current_running_version
     pipe \
       current_running_container(format: "--format '{{.Names}}'"),
@@ -90,11 +72,21 @@ class Kamal::Commands::App < Kamal::Commands::Base
       extract_version_from_name
   end
 
-  def ensure_env_directory
+
-    make_directory role.env_directory
+  def make_env_directory
+    make_directory role.env(host).secrets_directory
   end
 
+  def remove_env_file
+    [ :rm, "-f", role.env(host).secrets_file ]
+  end
+
+
   private
+    def container_name(version = nil)
+      [ role.container_prefix, version || config.version ].compact.join("-")
+    end
+
     def latest_image_id
       docker :image, :ls, *argumentize("--filter", "reference=#{config.latest_image}"), "--format", "'{{.ID}}'"
     end

lib/kamal/commands/app/containers.rb

@@ -23,9 +23,10 @@ module Kamal::Commands::App::Containers
     docker :container, :prune, "--force", *filter_args
   end
 
-  def container_health_log(version:)
+  def container_endpoint(version:)
     pipe \
       container_id_for(container_name: container_name(version)),
-      xargs(docker(:inspect, "--format", DOCKER_HEALTH_LOG_FORMAT))
+      xargs(docker(:inspect, "--format", "'{{.NetworkSettings.IPAddress}}{{range $k, $v := .NetworkSettings.Ports}}{{printf \":%s\" $k}}{{break}}{{end}}'")),
+      [ :sed, "-e", "'s/\\/tcp$//'" ]
   end
 end

lib/kamal/commands/app/cord.rb

@@ -1,22 +0,0 @@
-module Kamal::Commands::App::Cord
-  def cord(version:)
-    pipe \
-      docker(:inspect, "-f '{{ range .Mounts }}{{printf \"%s %s\\n\" .Source .Destination}}{{ end }}'", container_name(version)),
-      [ :awk, "'$2 == \"#{role.cord_volume.container_path}\" {print $1}'" ]
-  end
-
-  def tie_cord(cord)
-    create_empty_file(cord)
-  end
-
-  def cut_cord(cord)
-    remove_directory(cord)
-  end
-
-  private
-    def create_empty_file(file)
-      chain \
-        make_directory_for(file),
-        [ :touch, file ]
-    end
-end

lib/kamal/commands/app/logging.rb

@@ -1,17 +1,17 @@
 module Kamal::Commands::App::Logging
-  def logs(version: nil, since: nil, lines: nil, grep: nil, grep_options: nil)
+  def logs(version: nil, since: nil, lines: nil, grep: nil)
     pipe \
       version ? container_id_for_version(version) : current_running_container_id,
       "xargs docker logs#{" --since #{since}" if since}#{" --tail #{lines}" if lines} 2>&1",
-      ("grep '#{grep}'#{" #{grep_options}" if grep_options}" if grep)
+      ("grep '#{grep}'" if grep)
   end
 
-  def follow_logs(host:, lines: nil, grep: nil, grep_options: nil)
+  def follow_logs(host:, lines: nil, grep: nil)
     run_over_ssh \
       pipe(
         current_running_container_id,
         "xargs docker logs --timestamps#{" --tail #{lines}" if lines} --follow 2>&1",
-        (%(grep "#{grep}"#{" #{grep_options}" if grep_options}) if grep)
+        (%(grep "#{grep}") if grep)
       ),
       host: host
   end

lib/kamal/commands/auditor.rb

@@ -8,12 +8,9 @@ class Kamal::Commands::Auditor < Kamal::Commands::Base
 
   # Runs remotely
   def record(line, **details)
-    combine \
+    append \
-      [ :mkdir, "-p", config.run_directory ],
+      [ :echo, audit_tags(**details).except(:version, :service_version).to_s, line ],
-      append(
-        [ :echo, audit_tags(**details).except(:version, :service_version, :service).to_s, line ],
       audit_log_file
-      )
   end
 
   def reveal

lib/kamal/commands/base.rb

@@ -37,10 +37,6 @@ module Kamal::Commands
       [ :rm, "-r", path ]
     end
 
-    def remove_file(path)
-      [ :rm, path ]
-    end
-
     private
       def combine(*commands, by: "&&")
         commands
@@ -85,10 +81,6 @@ module Kamal::Commands
         [ :git, *([ "-C", path ] if path), *args.compact ]
       end
 
-      def grep(*args)
-        args.compact.unshift :grep
-      end
-
       def tags(**details)
         Kamal::Tags.from_config(config, **details)
       end

lib/kamal/commands/builder.rb

@@ -1,8 +1,7 @@
 require "active_support/core_ext/string/filters"
 
 class Kamal::Commands::Builder < Kamal::Commands::Base
-  delegate :create, :remove, :push, :clean, :pull, :info, :inspect_builder, :validate_image, :first_mirror, to: :target
+  delegate :create, :remove, :push, :clean, :pull, :info, :validate_image, to: :target
-  delegate :local?, :remote?, to: "config.builder"
 
   include Clone
 
@@ -11,27 +10,38 @@ class Kamal::Commands::Builder < Kamal::Commands::Base
   end
 
   def target
-    if remote?
+    case
-      if local?
+    when !config.builder.multiarch? && !config.builder.cached?
-        hybrid
+      native
+    when !config.builder.multiarch? && config.builder.cached?
+      native_cached
+    when config.builder.local? && config.builder.remote?
+      multiarch_remote
+    when config.builder.remote?
+      native_remote
     else
-        remote
+      multiarch
-      end
-    else
-      local
     end
   end
 
-  def remote
+  def native
-    @remote ||= Kamal::Commands::Builder::Remote.new(config)
+    @native ||= Kamal::Commands::Builder::Native.new(config)
   end
 
-  def local
+  def native_cached
-    @local ||= Kamal::Commands::Builder::Local.new(config)
+    @native ||= Kamal::Commands::Builder::Native::Cached.new(config)
   end
 
-  def hybrid
+  def native_remote
-    @hybrid ||= Kamal::Commands::Builder::Hybrid.new(config)
+    @native ||= Kamal::Commands::Builder::Native::Remote.new(config)
+  end
+
+  def multiarch
+    @multiarch ||= Kamal::Commands::Builder::Multiarch.new(config)
+  end
+
+  def multiarch_remote
+    @multiarch_remote ||= Kamal::Commands::Builder::Multiarch::Remote.new(config)
   end
 
 

lib/kamal/commands/builder/base.rb

@@ -1,41 +1,18 @@
+
 class Kamal::Commands::Builder::Base < Kamal::Commands::Base
   class BuilderError < StandardError; end
 
-  ENDPOINT_DOCKER_HOST_INSPECT = "'{{.Endpoints.docker.Host}}'"
-
   delegate :argumentize, to: Kamal::Utils
-  delegate \
+  delegate :args, :secrets, :dockerfile, :target, :local_arch, :local_host, :remote_arch, :remote_host, :cache_from, :cache_to, :ssh, to: :builder_config
-    :args, :secrets, :dockerfile, :target, :arches, :local_arches, :remote_arches, :remote,
-    :cache_from, :cache_to, :ssh, :driver, :docker_driver?,
-    to: :builder_config
 
   def clean
     docker :image, :rm, "--force", config.absolute_image
   end
 
-  def push
-    docker :buildx, :build,
-      "--push",
-      *platform_options(arches),
-      *([ "--builder", builder_name ] unless docker_driver?),
-      *build_options,
-      build_context
-  end
-
   def pull
     docker :pull, config.absolute_image
   end
 
-  def info
-    combine \
-      docker(:context, :ls),
-      docker(:buildx, :ls)
-  end
-
-  def inspect_builder
-    docker :buildx, :inspect, builder_name unless docker_driver?
-  end
-
   def build_options
     [ *build_tags, *build_cache, *build_labels, *build_args, *build_secrets, *build_dockerfile, *build_target, *build_ssh ]
   end
@@ -53,9 +30,6 @@ class Kamal::Commands::Builder::Base < Kamal::Commands::Base
       )
   end
 
-  def first_mirror
-    docker(:info, "--format '{{index .RegistryConfig.Mirrors 0}}'")
-  end
 
   private
     def build_tags
@@ -78,7 +52,7 @@ class Kamal::Commands::Builder::Base < Kamal::Commands::Base
     end
 
     def build_secrets
-      argumentize "--secret", secrets.keys.collect { |secret| [ "id", secret ] }
+      argumentize "--secret", secrets.collect { |secret| [ "id", secret ] }
     end
 
     def build_dockerfile
@@ -100,8 +74,4 @@ class Kamal::Commands::Builder::Base < Kamal::Commands::Base
     def builder_config
       config.builder
     end
-
-    def platform_options(arches)
-      argumentize "--platform", arches.map { |arch| "linux/#{arch}" }.join(",") if arches.any?
-    end
 end

lib/kamal/commands/builder/clone.rb

@@ -6,7 +6,7 @@ module Kamal::Commands::Builder::Clone
   end
 
   def clone
-    git :clone, Kamal::Git.root, "--recurse-submodules", path: clone_directory
+    git :clone, Kamal::Git.root, path: clone_directory
   end
 
   def clone_reset_steps
@@ -14,8 +14,7 @@ module Kamal::Commands::Builder::Clone
       git(:remote, "set-url", :origin, Kamal::Git.root, path: build_directory),
       git(:fetch, :origin, path: build_directory),
       git(:reset, "--hard", Kamal::Git.revision, path: build_directory),
-      git(:clean, "-fdx", path: build_directory),
+      git(:clean, "-fdx", path: build_directory)
-      git(:submodule, :update, "--init", path: build_directory)
     ]
   end
 

lib/kamal/commands/builder/hybrid.rb

@@ -1,21 +0,0 @@
-class Kamal::Commands::Builder::Hybrid < Kamal::Commands::Builder::Remote
-  def create
-    combine \
-      create_local_buildx,
-      create_remote_context,
-      append_remote_buildx
-  end
-
-  private
-    def builder_name
-      "kamal-hybrid-#{driver}-#{remote.gsub(/[^a-z0-9_-]/, "-")}"
-    end
-
-    def create_local_buildx
-      docker :buildx, :create, *platform_options(local_arches), "--name", builder_name, "--driver=#{driver}"
-    end
-
-    def append_remote_buildx
-      docker :buildx, :create, *platform_options(remote_arches), "--append", "--name", builder_name, remote_context_name
-    end
-end

lib/kamal/commands/builder/local.rb

@@ -1,14 +0,0 @@
-class Kamal::Commands::Builder::Local < Kamal::Commands::Builder::Base
-  def create
-    docker :buildx, :create, "--name", builder_name, "--driver=#{driver}" unless docker_driver?
-  end
-
-  def remove
-    docker :buildx, :rm, builder_name unless docker_driver?
-  end
-
-  private
-    def builder_name
-      "kamal-local-#{driver}"
-    end
-end

lib/kamal/commands/builder/multiarch.rb

@@ -0,0 +1,37 @@
+class Kamal::Commands::Builder::Multiarch < Kamal::Commands::Builder::Base
+  def create
+    docker :buildx, :create, "--use", "--name", builder_name
+  end
+
+  def remove
+    docker :buildx, :rm, builder_name
+  end
+
+  def info
+    combine \
+      docker(:context, :ls),
+      docker(:buildx, :ls)
+  end
+
+  def push
+    docker :buildx, :build,
+      "--push",
+      "--platform", platform_names,
+      "--builder", builder_name,
+      *build_options,
+      build_context
+  end
+
+  private
+    def builder_name
+      "kamal-#{config.service}-multiarch"
+    end
+
+    def platform_names
+      if local_arch
+        "linux/#{local_arch}"
+      else
+        "linux/amd64,linux/arm64"
+      end
+    end
+end

lib/kamal/commands/builder/multiarch/remote.rb

@@ -0,0 +1,51 @@
+class Kamal::Commands::Builder::Multiarch::Remote < Kamal::Commands::Builder::Multiarch
+  def create
+    combine \
+      create_contexts,
+      create_local_buildx,
+      append_remote_buildx
+  end
+
+  def remove
+    combine \
+      remove_contexts,
+      super
+  end
+
+  private
+    def builder_name
+      super + "-remote"
+    end
+
+    def builder_name_with_arch(arch)
+      "#{builder_name}-#{arch}"
+    end
+
+    def create_local_buildx
+      docker :buildx, :create, "--name", builder_name, builder_name_with_arch(local_arch), "--platform", "linux/#{local_arch}"
+    end
+
+    def append_remote_buildx
+      docker :buildx, :create, "--append", "--name", builder_name, builder_name_with_arch(remote_arch), "--platform", "linux/#{remote_arch}"
+    end
+
+    def create_contexts
+      combine \
+        create_context(local_arch, local_host),
+        create_context(remote_arch, remote_host)
+    end
+
+    def create_context(arch, host)
+      docker :context, :create, builder_name_with_arch(arch), "--description", "'#{builder_name} #{arch} native host'", "--docker", "'host=#{host}'"
+    end
+
+    def remove_contexts
+      combine \
+        remove_context(local_arch),
+        remove_context(remote_arch)
+    end
+
+    def remove_context(arch)
+      docker :context, :rm, builder_name_with_arch(arch)
+    end
+end

lib/kamal/commands/builder/native.rb

@@ -0,0 +1,20 @@
+class Kamal::Commands::Builder::Native < Kamal::Commands::Builder::Base
+  def create
+    # No-op on native without cache
+  end
+
+  def remove
+    # No-op on native without cache
+  end
+
+  def info
+    # No-op on native
+  end
+
+  def push
+    combine \
+      docker(:build, *build_options, build_context),
+      docker(:push, config.absolute_image),
+      docker(:push, config.latest_image)
+  end
+end

lib/kamal/commands/builder/native/cached.rb

@@ -0,0 +1,16 @@
+class Kamal::Commands::Builder::Native::Cached < Kamal::Commands::Builder::Native
+  def create
+    docker :buildx, :create, "--use", "--driver=docker-container"
+  end
+
+  def remove
+    docker :buildx, :rm, builder_name
+  end
+
+  def push
+    docker :buildx, :build,
+      "--push",
+      *build_options,
+      build_context
+  end
+end

lib/kamal/commands/builder/native/remote.rb

@@ -0,0 +1,59 @@
+class Kamal::Commands::Builder::Native::Remote < Kamal::Commands::Builder::Native
+  def create
+    chain \
+      create_context,
+      create_buildx
+  end
+
+  def remove
+    chain \
+      remove_context,
+      remove_buildx
+  end
+
+  def info
+    chain \
+      docker(:context, :ls),
+      docker(:buildx, :ls)
+  end
+
+  def push
+    docker :buildx, :build,
+    "--push",
+    "--platform", platform,
+    "--builder", builder_name,
+    *build_options,
+    build_context
+  end
+
+
+  private
+    def builder_name
+      "kamal-#{config.service}-native-remote"
+    end
+
+    def builder_name_with_arch
+      "#{builder_name}-#{remote_arch}"
+    end
+
+    def platform
+      "linux/#{remote_arch}"
+    end
+
+    def create_context
+      docker :context, :create,
+        builder_name_with_arch, "--description", "'#{builder_name} #{remote_arch} native host'", "--docker", "'host=#{remote_host}'"
+    end
+
+    def remove_context
+      docker :context, :rm, builder_name_with_arch
+    end
+
+    def create_buildx
+      docker :buildx, :create, "--name", builder_name, builder_name_with_arch, "--platform", platform
+    end
+
+    def remove_buildx
+      docker :buildx, :rm, builder_name
+    end
+end

lib/kamal/commands/builder/remote.rb

@@ -1,63 +0,0 @@
-class Kamal::Commands::Builder::Remote < Kamal::Commands::Builder::Base
-  def create
-    chain \
-      create_remote_context,
-      create_buildx
-  end
-
-  def remove
-    chain \
-      remove_remote_context,
-      remove_buildx
-  end
-
-  def info
-    chain \
-      docker(:context, :ls),
-      docker(:buildx, :ls)
-  end
-
-  def inspect_builder
-    combine \
-      combine inspect_buildx, inspect_remote_context,
-      [ "(echo no compatible builder && exit 1)" ],
-      by: "||"
-  end
-
-  private
-    def builder_name
-      "kamal-remote-#{remote.gsub(/[^a-z0-9_-]/, "-")}"
-    end
-
-    def remote_context_name
-      "#{builder_name}-context"
-    end
-
-    def inspect_buildx
-      pipe \
-        docker(:buildx, :inspect, builder_name),
-        grep("-q", "Endpoint:.*#{remote_context_name}")
-    end
-
-    def inspect_remote_context
-      pipe \
-        docker(:context, :inspect, remote_context_name, "--format", ENDPOINT_DOCKER_HOST_INSPECT),
-        grep("-xq", remote)
-    end
-
-    def create_remote_context
-      docker :context, :create, remote_context_name, "--description", "'#{builder_name} host'", "--docker", "'host=#{remote}'"
-    end
-
-    def remove_remote_context
-      docker :context, :rm, remote_context_name
-    end
-
-    def create_buildx
-      docker :buildx, :create, "--name", builder_name, remote_context_name
-    end
-
-    def remove_buildx
-      docker :buildx, :rm, builder_name
-    end
-end

lib/kamal/commands/docker.rb

@@ -19,10 +19,6 @@ class Kamal::Commands::Docker < Kamal::Commands::Base
     [ '[ "${EUID:-$(id -u)}" -eq 0 ] || command -v sudo >/dev/null || command -v su >/dev/null' ]
   end
 
-  def create_network
-    docker :network, :create, :kamal
-  end
-
   private
     def get_docker
       shell \

lib/kamal/commands/hook.rb

@@ -1,9 +1,6 @@
 class Kamal::Commands::Hook < Kamal::Commands::Base
-  def run(hook, secrets: false, **details)
+  def run(hook, **details)
-    env = tags(**details).env
+    [ hook_file(hook), env: tags(**details).env ]
-    env.merge!(config.secrets.to_h) if secrets
-
-    [ hook_file(hook), env: env ]
   end
 
   def hook_exists?(hook)

lib/kamal/commands/proxy.rb

@@ -1,6 +1,6 @@
 class Kamal::Commands::Proxy < Kamal::Commands::Base
   delegate :argumentize, :optionize, to: Kamal::Utils
-  delegate :container_name, :app_port, to: :proxy_config
+  delegate :container_name, to: :proxy_config
 
   attr_reader :proxy_config
 
@@ -12,13 +12,13 @@ class Kamal::Commands::Proxy < Kamal::Commands::Base
   def run
     docker :run,
       "--name", container_name,
-      "--network", "kamal",
       "--detach",
       "--restart", "unless-stopped",
       *proxy_config.publish_args,
       "--volume", "/var/run/docker.sock:/var/run/docker.sock",
-      "--volume", "#{proxy_config.config_directory_as_docker_volume}:/root/.config/kamal-proxy",
+      "--volume", "#{container_name}:/root/.config/kamal-proxy",
       *config.logging_args,
+      *proxy_config.docker_options_args,
       proxy_config.image
   end
 
@@ -35,35 +35,45 @@ class Kamal::Commands::Proxy < Kamal::Commands::Base
   end
 
   def deploy(service, target:)
-    docker :exec, container_name, "kamal-proxy", :deploy, service, *optionize({ target: "#{target}:#{app_port}" }), *proxy_config.deploy_command_args
+    optionize({ target: target })
+    docker :exec, container_name, "kamal-proxy", :deploy, service, *optionize({ target: target }), *proxy_config.deploy_command_args
   end
 
   def remove(service, target:)
-    docker :exec, container_name, "kamal-proxy", :remove, service, *optionize({ target: "#{target}:#{app_port}" })
+    docker :exec, container_name, "kamal-proxy", :remove, service, *optionize({ target: target })
   end
 
   def info
     docker :ps, "--filter", "name=^#{container_name}$"
   end
 
-  def logs(since: nil, lines: nil, grep: nil, grep_options: nil)
+  def logs(since: nil, lines: nil, grep: nil)
     pipe \
       docker(:logs, container_name, (" --since #{since}" if since), (" --tail #{lines}" if lines), "--timestamps", "2>&1"),
-      ("grep '#{grep}'#{" #{grep_options}" if grep_options}" if grep)
+      ("grep '#{grep}'" if grep)
   end
 
-  def follow_logs(host:, grep: nil, grep_options: nil)
+  def follow_logs(host:, grep: nil)
     run_over_ssh pipe(
       docker(:logs, container_name, "--timestamps", "--tail", "10", "--follow", "2>&1"),
-      (%(grep "#{grep}"#{" #{grep_options}" if grep_options}) if grep)
+      (%(grep "#{grep}") if grep)
     ).join(" "), host: host
   end
 
-  def remove_container
+  def remove_container(filter: container_filter)
-    docker :container, :prune, "--force", "--filter", "label=org.opencontainers.image.title=kamal-proxy"
+    docker :container, :prune, "--force", "--filter", filter
   end
 
-  def remove_image
+  def remove_image(filter: image_filter)
-    docker :image, :prune, "--all", "--force", "--filter", "label=org.opencontainers.image.title=kamal-proxy"
+    docker :image, :prune, "--all", "--force", "--filter", filter
+  end
+
+  private
+    def container_filter
+      "label=org.opencontainers.image.title=kamal-proxy"
+    end
+
+    def image_filter
+      "label=org.opencontainers.image.title=kamal-proxy"
     end
 end

lib/kamal/commands/prune.rb

@@ -9,7 +9,7 @@ class Kamal::Commands::Prune < Kamal::Commands::Base
   def tagged_images
     pipe \
       docker(:image, :ls, *service_filter, "--format", "'{{.ID}} {{.Repository}}:{{.Tag}}'"),
-      grep("-v -w \"#{active_image_list}\""),
+      "grep -v -w \"#{active_image_list}\"",
       "while read image tag; do docker rmi $tag; done"
   end
 
@@ -20,10 +20,6 @@ class Kamal::Commands::Prune < Kamal::Commands::Base
       "while read container_id; do docker rm $container_id; done"
   end
 
-  def healthcheck_containers
-    docker :container, :prune, "--force", *healthcheck_service_filter
-  end
-
   private
     def stopped_containers_filters
       [ "created", "exited", "dead" ].flat_map { |status| [ "--filter", "status=#{status}" ] }
@@ -39,8 +35,4 @@ class Kamal::Commands::Prune < Kamal::Commands::Base
     def service_filter
       [ "--filter", "label=service=#{config.service}" ]
     end
-
-    def healthcheck_service_filter
-      [ "--filter", "label=service=#{config.healthcheck_service}" ]
-    end
 end

lib/kamal/commands/registry.rb

@@ -3,12 +3,21 @@ class Kamal::Commands::Registry < Kamal::Commands::Base
 
   def login
     docker :login,
-      registry.server,
+      registry["server"],
-      "-u", sensitive(Kamal::Utils.escape_shell_value(registry.username)),
+      "-u", sensitive(Kamal::Utils.escape_shell_value(lookup("username"))),
-      "-p", sensitive(Kamal::Utils.escape_shell_value(registry.password))
+      "-p", sensitive(Kamal::Utils.escape_shell_value(lookup("password")))
   end
 
   def logout
-    docker :logout, registry.server
+    docker :logout, registry["server"]
+  end
+
+  private
+    def lookup(key)
+      if registry[key].is_a?(Array)
+        ENV.fetch(registry[key].first).dup
+      else
+        registry[key]
+      end
     end
 end

lib/kamal/commands/traefik.rb

@@ -1,77 +0,0 @@
-class Kamal::Commands::Traefik < Kamal::Commands::Base
-  delegate :argumentize, :optionize, to: Kamal::Utils
-  delegate :port, :publish?, :labels, :env, :image, :options, :args, :env_args, :secrets_io, :env_directory, :secrets_path, to: :"config.traefik"
-
-  def run
-    docker :run, "--name traefik",
-      "--detach",
-      "--restart", "unless-stopped",
-      *publish_args,
-      "--volume", "/var/run/docker.sock:/var/run/docker.sock",
-      *env_args,
-      *config.logging_args,
-      *label_args,
-      *docker_options_args,
-      image,
-      "--providers.docker",
-      *cmd_option_args
-  end
-
-  def start
-    docker :container, :start, "traefik"
-  end
-
-  def stop
-    docker :container, :stop, "traefik"
-  end
-
-  def start_or_run
-    any start, run
-  end
-
-  def info
-    docker :ps, "--filter", "name=^traefik$"
-  end
-
-  def logs(since: nil, lines: nil, grep: nil, grep_options: nil)
-    pipe \
-      docker(:logs, "traefik", (" --since #{since}" if since), (" --tail #{lines}" if lines), "--timestamps", "2>&1"),
-      ("grep '#{grep}'#{" #{grep_options}" if grep_options}" if grep)
-  end
-
-  def follow_logs(host:, grep: nil, grep_options: nil)
-    run_over_ssh pipe(
-      docker(:logs, "traefik", "--timestamps", "--tail", "10", "--follow", "2>&1"),
-      (%(grep "#{grep}"#{" #{grep_options}" if grep_options}) if grep)
-    ).join(" "), host: host
-  end
-
-  def remove_container
-    docker :container, :prune, "--force", "--filter", "label=org.opencontainers.image.title=Traefik"
-  end
-
-  def remove_image
-    docker :image, :prune, "--all", "--force", "--filter", "label=org.opencontainers.image.title=Traefik"
-  end
-
-  def ensure_env_directory
-    make_directory env_directory
-  end
-
-  private
-    def publish_args
-      argumentize "--publish", port if publish?
-    end
-
-    def label_args
-      argumentize "--label", labels
-    end
-
-    def docker_options_args
-      optionize(options)
-    end
-
-    def cmd_option_args
-      optionize args, with: "="
-    end
-end

lib/kamal/configuration.rb

@@ -1,18 +1,15 @@
 require "active_support/ordered_options"
 require "active_support/core_ext/string/inquiry"
 require "active_support/core_ext/module/delegation"
-require "active_support/core_ext/hash/keys"
+require "pathname"
 require "erb"
 require "net/ssh/proxy/jump"
 
 class Kamal::Configuration
-  delegate :service, :image, :labels, :stop_wait_time, :hooks_path, to: :raw_config, allow_nil: true
+  delegate :service, :image, :port, :servers, :labels, :registry, :stop_wait_time, :hooks_path, :logging, to: :raw_config, allow_nil: true
   delegate :argumentize, :optionize, to: Kamal::Utils
 
   attr_reader :destination, :raw_config
-  attr_reader :accessories, :aliases, :boot, :builder, :env, :healthcheck, :logging, :proxy, :traefik, :servers, :ssh, :sshkit, :registry
-
-  include Validation
 
   class << self
     def create_from(config_file:, destination: nil, version: nil)
@@ -45,31 +42,7 @@ class Kamal::Configuration
     @raw_config = ActiveSupport::InheritableOptions.new(raw_config)
     @destination = destination
     @declared_version = version
-
+    valid? if validate
-    validate! raw_config, example: validation_yml.symbolize_keys, context: "", with: Kamal::Configuration::Validator::Configuration
-
-    # Eager load config to validate it, these are first as they have dependencies later on
-    @servers = Servers.new(config: self)
-    @registry = Registry.new(config: self)
-
-    @accessories = @raw_config.accessories&.keys&.collect { |name| Accessory.new(name, config: self) } || []
-    @aliases = @raw_config.aliases&.keys&.to_h { |name| [ name, Alias.new(name, config: self) ] } || {}
-    @boot = Boot.new(config: self)
-    @builder = Builder.new(config: self)
-    @env = Env.new(config: @raw_config.env || {}, secrets: secrets)
-
-    @healthcheck = Healthcheck.new(healthcheck_config: @raw_config.healthcheck)
-    @logging = Logging.new(logging_config: @raw_config.logging)
-    @proxy = Proxy.new(config: self)
-    @traefik = Traefik.new(config: self)
-    @ssh = Ssh.new(config: self)
-    @sshkit = Sshkit.new(config: self)
-
-    ensure_destination_if_required
-    ensure_required_keys_present
-    ensure_valid_kamal_version
-    ensure_retain_containers_valid
-    ensure_valid_service_name
   end
 
 
@@ -98,13 +71,17 @@ class Kamal::Configuration
 
 
   def roles
-    servers.roles
+    @roles ||= role_names.collect { |role_name| Role.new(role_name, config: self) }
   end
 
   def role(name)
     roles.detect { |r| r.name == name.to_s }
   end
 
+  def accessories
+    @accessories ||= raw_config.accessories&.keys&.collect { |name| Kamal::Configuration::Accessory.new(name, config: self) } || []
+  end
+
   def accessory(name)
     accessories.detect { |a| a.name == name.to_s }
   end
@@ -130,24 +107,20 @@ class Kamal::Configuration
     raw_config.allow_empty_roles
   end
 
-  def traefik_roles
+  def proxy_roles
-    roles.select(&:running_traefik?)
+    roles.select(&:running_proxy?)
   end
 
-  def traefik_role_names
+  def proxy_role_names
-    traefik_roles.flat_map(&:name)
+    proxy_roles.flat_map(&:name)
-  end
-
-  def traefik_hosts
-    traefik_roles.flat_map(&:hosts).uniq
   end
 
   def proxy_hosts
-    proxy.hosts
+    proxy_roles.flat_map(&:hosts).uniq
   end
 
   def repository
-    [ registry.server, image ].compact.join("/")
+    [ raw_config.registry["server"], image ].compact.join("/")
   end
 
   def absolute_image
@@ -184,14 +157,36 @@ class Kamal::Configuration
   end
 
   def logging_args
-    logging.args
+    if logging.present?
+      optionize({ "log-driver" => logging["driver"] }.compact) +
+        argumentize("--log-opt", logging["options"])
+    else
+      argumentize("--log-opt", { "max-size" => "10m" })
+    end
   end
 
 
-  def healthcheck_service
+  def boot
-    [ "healthcheck", service, destination ].compact.join("-")
+    Kamal::Configuration::Boot.new(config: self)
   end
 
+  def builder
+    Kamal::Configuration::Builder.new(config: self)
+  end
+
+  def proxy
+    Kamal::Configuration::Proxy.new(config: self)
+  end
+
+  def ssh
+    Kamal::Configuration::Ssh.new(config: self)
+  end
+
+  def sshkit
+    Kamal::Configuration::Sshkit.new(config: self)
+  end
+
+
   def readiness_delay
     raw_config.readiness_delay || 7
   end
@@ -202,12 +197,16 @@ class Kamal::Configuration
 
 
   def run_directory
-    ".kamal"
+    raw_config.run_directory || ".kamal"
   end
 
   def run_directory_as_docker_volume
+    if Pathname.new(run_directory).absolute?
+      run_directory
+    else
       File.join "$(pwd)", run_directory
     end
+  end
 
   def hooks_path
     raw_config.hooks_path || ".kamal/hooks"
@@ -218,13 +217,17 @@ class Kamal::Configuration
   end
 
 
-  def env_directory
+  def host_env_directory
     File.join(run_directory, "env")
   end
 
+  def env
+    raw_config.env || {}
+  end
+
   def env_tags
     @env_tags ||= if (tags = raw_config.env["tags"])
-      tags.collect { |name, config| Env::Tag.new(name, config: config, secrets: secrets) }
+      tags.collect { |name, config| Kamal::Configuration::Env::Tag.new(name, config: config) }
     else
       []
     end
@@ -235,6 +238,10 @@ class Kamal::Configuration
   end
 
 
+  def valid?
+    ensure_destination_if_required && ensure_required_keys_present && ensure_valid_kamal_version && ensure_retain_containers_valid && ensure_valid_service_name
+  end
+
   def to_h
     {
       roles: role_names,
@@ -249,14 +256,10 @@ class Kamal::Configuration
       sshkit: sshkit.to_h,
       builder: builder.to_h,
       accessories: raw_config.accessories,
-      logging: logging_args,
+      logging: logging_args
-      healthcheck: healthcheck.to_h
     }.compact
   end
 
-  def secrets
-    @secrets ||= Kamal::Secrets.new(destination: destination)
-  end
 
   private
     # Will raise ArgumentError if any required config keys are missing
@@ -270,21 +273,29 @@ class Kamal::Configuration
 
     def ensure_required_keys_present
       %i[ service image registry servers ].each do |key|
-        raise Kamal::ConfigurationError, "Missing required configuration for #{key}" unless raw_config[key].present?
+        raise ArgumentError, "Missing required configuration for #{key}" unless raw_config[key].present?
       end
 
-      unless role(primary_role_name).present?
+      if raw_config.registry["username"].blank?
-        raise Kamal::ConfigurationError, "The primary_role #{primary_role_name} isn't defined"
+        raise ArgumentError, "You must specify a username for the registry in config/deploy.yml"
+      end
+
+      if raw_config.registry["password"].blank?
+        raise ArgumentError, "You must specify a password for the registry in config/deploy.yml (or set the ENV variable if that's used)"
+      end
+
+      unless role_names.include?(primary_role_name)
+        raise ArgumentError, "The primary_role #{primary_role_name} isn't defined"
       end
 
       if primary_role.hosts.empty?
-        raise Kamal::ConfigurationError, "No servers specified for the #{primary_role.name} primary_role"
+        raise ArgumentError, "No servers specified for the #{primary_role.name} primary_role"
       end
 
       unless allow_empty_roles?
         roles.each do |role|
           if role.hosts.empty?
-            raise Kamal::ConfigurationError, "No servers specified for the #{role.name} role. You can ignore this with allow_empty_roles: true"
+            raise ArgumentError, "No servers specified for the #{role.name} role. You can ignore this with allow_empty_roles: true"
           end
         end
       end
@@ -293,21 +304,21 @@ class Kamal::Configuration
     end
 
     def ensure_valid_service_name
-      raise Kamal::ConfigurationError, "Service name can only include alphanumeric characters, hyphens, and underscores" unless raw_config[:service] =~ /^[a-z0-9_-]+$/i
+      raise ArgumentError, "Service name can only include alphanumeric characters, hyphens, and underscores" unless raw_config[:service] =~ /^[a-z0-9_-]+$/i
 
       true
     end
 
     def ensure_valid_kamal_version
       if minimum_version && Gem::Version.new(minimum_version) > Gem::Version.new(Kamal::VERSION)
-        raise Kamal::ConfigurationError, "Current version is #{Kamal::VERSION}, minimum required is #{minimum_version}"
+        raise ArgumentError, "Current version is #{Kamal::VERSION}, minimum required is #{minimum_version}"
       end
 
       true
     end
 
     def ensure_retain_containers_valid
-      raise Kamal::ConfigurationError, "Must retain at least 1 container" if retain_containers < 1
+      raise ArgumentError, "Must retain at least 1 container" if retain_containers < 1
 
       true
     end

lib/kamal/configuration/accessory.rb

@@ -1,39 +1,30 @@
 class Kamal::Configuration::Accessory
-  include Kamal::Configuration::Validation
-
   delegate :argumentize, :optionize, to: Kamal::Utils
 
-  attr_reader :name, :accessory_config, :env
+  attr_accessor :name, :specifics
 
   def initialize(name, config:)
-    @name, @config, @accessory_config = name.inquiry, config, config.raw_config["accessories"][name]
+    @name, @config, @specifics = name.inquiry, config, config.raw_config["accessories"][name]
-
-    validate! \
-      accessory_config,
-      example: validation_yml["accessories"]["mysql"],
-      context: "accessories/#{name}",
-      with: Kamal::Configuration::Validator::Accessory
-
-    @env = Kamal::Configuration::Env.new \
-      config: accessory_config.fetch("env", {}),
-      secrets: config.secrets,
-      context: "accessories/#{name}/env"
   end
 
   def service_name
-    accessory_config["service"] || "#{config.service}-#{name}"
+    specifics["service"] || "#{config.service}-#{name}"
   end
 
   def image
-    accessory_config["image"]
+    specifics["image"]
   end
 
   def hosts
+    if (specifics.keys & [ "host", "hosts", "roles" ]).size != 1
+      raise ArgumentError, "Specify one of `host`, `hosts` or `roles` for accessory `#{name}`"
+    end
+
     hosts_from_host || hosts_from_hosts || hosts_from_roles
   end
 
   def port
-    if port = accessory_config["port"]&.to_s
+    if port = specifics["port"]&.to_s
       port.include?(":") ? port : "#{port}:#{port}"
     end
   end
@@ -43,38 +34,32 @@ class Kamal::Configuration::Accessory
   end
 
   def labels
-    default_labels.merge(accessory_config["labels"] || {})
+    default_labels.merge(specifics["labels"] || {})
   end
 
   def label_args
     argumentize "--label", labels
   end
 
+  def env
+    Kamal::Configuration::Env.from_config \
+      config: specifics.fetch("env", {}),
+      secrets_file: File.join(config.host_env_directory, "accessories", "#{service_name}.env")
+  end
+
   def env_args
-    [ *env.clear_args, *argumentize("--env-file", secrets_path) ]
+    env.args
-  end
-
-  def env_directory
-    File.join(config.env_directory, "accessories")
-  end
-
-  def secrets_io
-    env.secrets_io
-  end
-
-  def secrets_path
-    File.join(config.env_directory, "accessories", "#{service_name}.env")
   end
 
   def files
-    accessory_config["files"]&.to_h do |local_to_remote_mapping|
+    specifics["files"]&.to_h do |local_to_remote_mapping|
       local_file, remote_file = local_to_remote_mapping.split(":")
       [ expand_local_file(local_file), expand_remote_file(remote_file) ]
     end || {}
   end
 
   def directories
-    accessory_config["directories"]&.to_h do |host_to_container_mapping|
+    specifics["directories"]&.to_h do |host_to_container_mapping|
       host_path, container_path = host_to_container_mapping.split(":")
       [ expand_host_path(host_path), container_path ]
     end || {}
@@ -89,7 +74,7 @@ class Kamal::Configuration::Accessory
   end
 
   def option_args
-    if args = accessory_config["options"]
+    if args = specifics["options"]
       optionize args
     else
       []
@@ -97,7 +82,7 @@ class Kamal::Configuration::Accessory
   end
 
   def cmd
-    accessory_config["cmd"]
+    specifics["cmd"]
   end
 
   private
@@ -131,18 +116,18 @@ class Kamal::Configuration::Accessory
     end
 
     def specific_volumes
-      accessory_config["volumes"] || []
+      specifics["volumes"] || []
     end
 
     def remote_files_as_volumes
-      accessory_config["files"]&.collect do |local_to_remote_mapping|
+      specifics["files"]&.collect do |local_to_remote_mapping|
         _, remote_file = local_to_remote_mapping.split(":")
         "#{service_data_directory + remote_file}:#{remote_file}"
       end || []
     end
 
     def remote_directories_as_volumes
-      accessory_config["directories"]&.collect do |host_to_container_mapping|
+      specifics["directories"]&.collect do |host_to_container_mapping|
         host_path, container_path = host_to_container_mapping.split(":")
         [ expand_host_path(host_path), container_path ].join(":")
       end || []
@@ -161,16 +146,30 @@ class Kamal::Configuration::Accessory
     end
 
     def hosts_from_host
-      [ accessory_config["host"] ] if accessory_config.key?("host")
+      if specifics.key?("host")
+        host = specifics["host"]
+        if host
+          [ host ]
+        else
+          raise ArgumentError, "Missing host for accessory `#{name}`"
+        end
+      end
     end
 
     def hosts_from_hosts
-      accessory_config["hosts"] if accessory_config.key?("hosts")
+      if specifics.key?("hosts")
+        hosts = specifics["hosts"]
+        if hosts.is_a?(Array)
+          hosts
+        else
+          raise ArgumentError, "Hosts should be an Array for accessory `#{name}`"
+        end
+      end
     end
 
     def hosts_from_roles
-      if accessory_config.key?("roles")
+      if specifics.key?("roles")
-        accessory_config["roles"].flat_map { |role| config.role(role).hosts }
+        specifics["roles"].flat_map { |role| config.role(role).hosts }
       end
     end
 end

lib/kamal/configuration/alias.rb

@@ -1,15 +0,0 @@
-class Kamal::Configuration::Alias
-  include Kamal::Configuration::Validation
-
-  attr_reader :name, :command
-
-  def initialize(name, config:)
-    @name, @command = name.inquiry, config.raw_config["aliases"][name]
-
-    validate! \
-      command,
-      example: validation_yml["aliases"]["uname"],
-      context: "aliases/#{name}",
-      with: Kamal::Configuration::Validator::Alias
-  end
-end

lib/kamal/configuration/boot.rb

@@ -1,25 +1,20 @@
 class Kamal::Configuration::Boot
-  include Kamal::Configuration::Validation
-
-  attr_reader :boot_config, :host_count
-
   def initialize(config:)
-    @boot_config = config.raw_config.boot || {}
+    @options = config.raw_config.boot || {}
     @host_count = config.all_hosts.count
-    validate! boot_config
   end
 
   def limit
-    limit = boot_config["limit"]
+    limit = @options["limit"]
 
     if limit.to_s.end_with?("%")
-      [ host_count * limit.to_i / 100, 1 ].max
+      [ @host_count * limit.to_i / 100, 1 ].max
     else
       limit
     end
   end
 
   def wait
-    boot_config["wait"]
+    @options["wait"]
   end
 end

lib/kamal/configuration/builder.rb

@@ -1,93 +1,73 @@
 class Kamal::Configuration::Builder
-  include Kamal::Configuration::Validation
-
-  attr_reader :config, :builder_config
-  delegate :image, :service, to: :config
-  delegate :server, to: :"config.registry"
-
   def initialize(config:)
-    @config = config
+    @options = config.raw_config.builder || {}
-    @builder_config = config.raw_config.builder || {}
     @image = config.image
-    @server = config.registry.server
+    @server = config.registry["server"]
     @service = config.service
+    @destination = config.destination
 
-    validate! builder_config, with: Kamal::Configuration::Validator::Builder
+    valid?
   end
 
   def to_h
-    builder_config
+    @options
   end
 
-  def remote
+  def multiarch?
-    builder_config["remote"]
+    @options["multiarch"] != false
-  end
-
-  def arches
-    Array(builder_config.fetch("arch", default_arch))
-  end
-
-  def local_arches
-    @local_arches ||= if local_disabled?
-      []
-    elsif remote
-      arches & [ Kamal::Utils.docker_arch ]
-    else
-      arches
-    end
-  end
-
-  def remote_arches
-    @remote_arches ||= if remote
-      arches - local_arches
-    else
-      []
-    end
-  end
-
-  def remote?
-    remote_arches.any?
   end
 
   def local?
-    !local_disabled? && (arches.empty? || local_arches.any?)
+    !!@options["local"]
+  end
+
+  def remote?
+    !!@options["remote"]
   end
 
   def cached?
-    !!builder_config["cache"]
+    !!@options["cache"]
   end
 
   def args
-    builder_config["args"] || {}
+    @options["args"] || {}
   end
 
   def secrets
-    (builder_config["secrets"] || []).to_h { |key| [ key, config.secrets[key] ] }
+    @options["secrets"] || []
   end
 
   def dockerfile
-    builder_config["dockerfile"] || "Dockerfile"
+    @options["dockerfile"] || "Dockerfile"
   end
 
   def target
-    builder_config["target"]
+    @options["target"]
   end
 
   def context
-    builder_config["context"] || "."
+    @options["context"] || "."
   end
 
-  def driver
+  def local_arch
-    builder_config.fetch("driver", "docker-container")
+    @options["local"]["arch"] if local?
   end
 
-  def local_disabled?
+  def local_host
-    builder_config["local"] == false
+    @options["local"]["host"] if local?
+  end
+
+  def remote_arch
+    @options["remote"]["arch"] if remote?
+  end
+
+  def remote_host
+    @options["remote"]["host"] if remote?
   end
 
   def cache_from
     if cached?
-      case builder_config["cache"]["type"]
+      case @options["cache"]["type"]
       when "gha"
         cache_from_config_for_gha
       when "registry"
@@ -98,7 +78,7 @@ class Kamal::Configuration::Builder
 
   def cache_to
     if cached?
-      case builder_config["cache"]["type"]
+      case @options["cache"]["type"]
       when "gha"
         cache_to_config_for_gha
       when "registry"
@@ -108,15 +88,15 @@ class Kamal::Configuration::Builder
   end
 
   def ssh
-    builder_config["ssh"]
+    @options["ssh"]
   end
 
   def git_clone?
-    Kamal::Git.used? && builder_config["context"].nil?
+    Kamal::Git.used? && @options["context"].nil?
   end
 
   def clone_directory
-    @clone_directory ||= File.join Dir.tmpdir, "kamal-clones", [ service, pwd_sha ].compact.join("-")
+    @clone_directory ||= File.join Dir.tmpdir, "kamal-clones", [ @service, pwd_sha ].compact.join("-")
   end
 
   def build_directory
@@ -128,29 +108,19 @@ class Kamal::Configuration::Builder
       end
   end
 
-  def docker_driver?
-    driver == "docker"
-  end
-
   private
     def valid?
-      if docker_driver?
-        raise ArgumentError, "Invalid builder configuration: the `docker` driver does not not support remote builders" if remote
-        raise ArgumentError, "Invalid builder configuration: the `docker` driver does not not support caching" if cached?
-        raise ArgumentError, "Invalid builder configuration: the `docker` driver does not not support multiple arches" if arches.many?
-      end
-
       if @options["cache"] && @options["cache"]["type"]
         raise ArgumentError, "Invalid cache type: #{@options["cache"]["type"]}" unless [ "gha", "registry" ].include?(@options["cache"]["type"])
       end
     end
 
     def cache_image
-      builder_config["cache"]&.fetch("image", nil) || "#{image}-build-cache"
+      @options["cache"]&.fetch("image", nil) || "#{@image}-build-cache"
     end
 
     def cache_image_ref
-      [ server, cache_image ].compact.join("/")
+      [ @server, cache_image ].compact.join("/")
     end
 
     def cache_from_config_for_gha
@@ -162,11 +132,11 @@ class Kamal::Configuration::Builder
     end
 
     def cache_to_config_for_gha
-      [ "type=gha", builder_config["cache"]&.fetch("options", nil) ].compact.join(",")
+      [ "type=gha", @options["cache"]&.fetch("options", nil) ].compact.join(",")
     end
 
     def cache_to_config_for_registry
-      [ "type=registry", builder_config["cache"]&.fetch("options", nil), "ref=#{cache_image_ref}" ].compact.join(",")
+      [ "type=registry", @options["cache"]&.fetch("options", nil), "ref=#{cache_image_ref}" ].compact.join(",")
     end
 
     def repo_basename
@@ -180,8 +150,4 @@ class Kamal::Configuration::Builder
     def pwd_sha
       Digest::SHA256.hexdigest(Dir.pwd)[0..12]
     end
-
-    def default_arch
-      docker_driver? ? [] : [ "amd64", "arm64" ]
-    end
 end

lib/kamal/configuration/docs/accessory.yml

@@ -1,90 +0,0 @@
-# Accessories
-#
-# Accessories can be booted on a single host, a list of hosts, or on specific roles.
-# The hosts do not need to be defined in the Kamal servers configuration.
-#
-# Accessories are managed separately from the main service - they are not updated
-# when you deploy and they do not have zero-downtime deployments.
-#
-# Run `kamal accessory boot <accessory>` to boot an accessory.
-# See `kamal accessory --help` for more information.
-
-# Configuring accessories
-#
-# First define the accessory in the `accessories`
-accessories:
-  mysql:
-
-    # Service name
-    #
-    # This is used in the service label and defaults to `<service>-<accessory>`
-    # where `<service>` is the main service name from the root configuration
-    service: mysql
-
-    # Image
-    #
-    # The Docker image to use, prefix with a registry if not using Docker hub
-    image: mysql:8.0
-
-    # Accessory hosts
-    #
-    # Specify one  of `host`, `hosts` or `roles`
-    host: mysql-db1
-    hosts:
-      - mysql-db1
-      - mysql-db2
-    roles:
-      - mysql
-
-    # Custom command
-    #
-    # You can set a custom command to run in the container, if you do not want to use the default
-    cmd: "bin/mysqld"
-
-    # Port mappings
-    #
-    # See https://docs.docker.com/network/, especially note the warning about the security
-    # implications of exposing ports publicly.
-    port: "127.0.0.1:3306:3306"
-
-    # Labels
-    labels:
-      app: myapp
-
-    # Options
-    # These are passed to the Docker run command in the form `--<name> <value>`
-    options:
-      restart: always
-      cpus: 2
-
-    # Environment variables
-    # See kamal docs env for more information
-    env:
-      ...
-
-    # Copying files
-    #
-    # You can specify files to mount into the container.
-    # The format is `local:remote` where `local` is the path to the file on the local machine
-    # and `remote` is the path to the file in the container.
-    #
-    # They will be uploaded from the local repo to the host and then mounted.
-    #
-    # ERB files will be evaluated before being copied.
-    files:
-      - config/my.cnf.erb:/etc/mysql/my.cnf
-      - config/myoptions.cnf:/etc/mysql/myoptions.cnf
-
-    # Directories
-    #
-    # You can specify directories to mount into the container. They will be created on the host
-    # before being mounted
-    directories:
-      - mysql-logs:/var/log/mysql
-
-    # Volumes
-    #
-    # Any other volumes to mount, in addition to the files and directories.
-    # They are not created or copied before mounting
-    volumes:
-      - /path/to/mysql-logs:/var/log/mysql

lib/kamal/configuration/docs/alias.yml

@@ -1,26 +0,0 @@
-# Aliases
-#
-# Aliases are shortcuts for Kamal commands.
-#
-# For example, for a Rails app, you might open a console with:
-#
-# ```shell
-# kamal app exec -i -r console "rails console"
-# ```
-#
-# By defining an alias, like this:
-aliases:
-  console: app exec -r console -i "rails console"
-# You can now open the console with:
-# ```shell
-# kamal console
-# ```
-
-# Configuring aliases
-#
-# Aliases are defined in the root config under the alias key
-#
-# Each alias is named and can only contain lowercase letters, numbers, dashes and underscores.
-
-aliases:
-  uname: app exec -p -q -r web "uname -a"

lib/kamal/configuration/docs/boot.yml

@@ -1,19 +0,0 @@
-# Booting
-#
-# When deploying to large numbers of hosts, you might prefer not to restart your services on every host at the same time.
-#
-# Kamal’s default is to boot new containers on all hosts in parallel. But you can control this with the boot configuration.
-
-# Fixed group sizes
-#
-# Here we boot 2 hosts at a time with a 10 second gap between each group.
-boot:
-  limit: 2
-  wait: 10
-
-# Percentage of hosts
-#
-# Here we boot 25% of the hosts at a time with a 2 second gap between each group.
-boot:
-  limit: 25%
-  wait: 2

lib/kamal/configuration/docs/builder.yml

@@ -1,105 +0,0 @@
-# Builder
-#
-# The builder configuration controls how the application is built with `docker build`
-#
-# If no configuration is specified, Kamal will:
-# 1. Create a buildx context called `kamal-local-docker-container`, using the docker-container driver
-# 2. Use `docker build` to build a multiarch image for linux/amd64,linux/arm64 with that context
-#
-# See https://kamal-deploy.org/docs/configuration/builder-examples/ for more information
-
-# Builder options
-#
-# Options go under the builder key in the root configuration.
-builder:
-  # Driver
-  #
-  # The build driver to use, defaults to `docker-container`
-  driver: docker
-
-  # Arch
-  #
-  # The architectures to build for, defaults to `[ amd64, arm64 ]`
-  # Unless you are using the docker driver, when it defaults to the local architecture
-  # You can set an array or just a single value
-  arch:
-    - amd64
-
-  # Remote configuration
-  #
-  # If you have a remote builder, you can configure it here
-  remote: ssh://docker@docker-builder
-
-  # Whether to allow local builds
-  #
-  # Defaults to true
-  local: true
-
-  # Builder cache
-  #
-  # The type must be either 'gha' or 'registry'
-  #
-  # The image is only used for registry cache. Not compatible with the docker driver
-  cache:
-    type: registry
-    options: mode=max
-    image: kamal-app-build-cache
-
-  # Build context
-  #
-  # If this is not set, then a local git clone of the repo is used.
-  # This ensures a clean build with no uncommitted changes.
-  #
-  # To use the local checkout instead you can set the context to `.`, or a path to another directory.
-  context: .
-
-  # Dockerfile
-  #
-  # The Dockerfile to use for building, defaults to `Dockerfile`
-  dockerfile: Dockerfile.production
-
-  # Build target
-  #
-  # If not set, then the default target is used
-  target: production
-
-  # Build Arguments
-  #
-  # Any additional build arguments, passed to `docker build` with `--build-arg <key>=<value>`
-  args:
-    ENVIRONMENT: production
-
-  # Referencing build arguments
-  #
-  # ```shell
-  # ARG RUBY_VERSION
-  # FROM ruby:$RUBY_VERSION-slim as base
-  # ```
-
-  # Build secrets
-  #
-  # Values are read from the environment.
-  #
-  secrets:
-    - SECRET1
-    - SECRET2
-
-  # Referencing Build Secrets
-  #
-  # ```shell
-  # # Copy Gemfiles
-  # COPY Gemfile Gemfile.lock ./
-  #
-  # # Install dependencies, including private repositories via access token
-  # # Then remove bundle cache with exposed GITHUB_TOKEN)
-  # RUN --mount=type=secret,id=GITHUB_TOKEN \
-  #   BUNDLE_GITHUB__COM=x-access-token:$(cat /run/secrets/GITHUB_TOKEN) \
-  #   bundle install && \
-  #   rm -rf /usr/local/bundle/cache
-  # ```
-
-
-  # SSH
-  #
-  # SSH agent socket or keys to expose to the build
-  ssh: default=$SSH_AUTH_SOCK

lib/kamal/configuration/docs/configuration.yml

@@ -1,180 +0,0 @@
-# Kamal Configuration
-#
-# Configuration is read from the `config/deploy.yml`
-#
-
-# Destinations
-#
-# When running commands, you can specify a destination with the `-d` flag,
-# e.g. `kamal deploy -d staging`
-#
-# In this case the configuration will also be read from `config/deploy.staging.yml`
-# and merged with the base configuration.
-
-# Extensions
-#
-# Kamal will not accept unrecognized keys in the configuration file.
-#
-# However, you might want to declare a configuration block using YAML anchors
-# and aliases to avoid repetition.
-#
-# You can use prefix a configuration section with `x-` to indicate that it is an
-# extension. Kamal will ignore the extension and not raise an error.
-
-# The service name
-# This is a required value. It is used as the container name prefix.
-service: myapp
-
-# The Docker image name
-#
-# The image will be pushed to the configured registry.
-image: my-image
-
-# Labels
-#
-# Additional labels to add to the container
-labels:
-  my-label: my-value
-
-# Additional volumes to mount into the container
-volumes:
-  - /path/on/host:/path/in/container:ro
-
-# Registry
-#
-# The Docker registry configuration, see kamal docs registry
-registry:
-  ...
-
-# Servers
-#
-# The servers to deploy to, optionally with custom roles, see kamal docs servers
-servers:
-  ...
-
-# Environment variables
-#
-# See kamal docs env
-env:
-  ...
-
-# Asset Bridging
-#
-# Used for asset bridging across deployments, default to `nil`
-#
-# If there are changes to CSS or JS files, we may get requests
-# for the old versions on the new container and vice-versa.
-#
-# To avoid 404s we can specify an asset path.
-# Kamal will replace that path in the container with a mapped
-# volume containing both sets of files.
-# This requires that file names change when the contents change
-# (e.g. by including a hash of the contents in the name).
-
-# To configure this, set the path to the assets:
-asset_path: /path/to/assets
-
-# Path to hooks, defaults to `.kamal/hooks`
-# See https://kamal-deploy.org/docs/hooks for more information
-hooks_path: /user_home/kamal/hooks
-
-# Require destinations
-#
-# Whether deployments require a destination to be specified, defaults to `false`
-require_destination: true
-
-# The primary role
-#
-# This defaults to `web`, but if you have no web role, you can change this
-primary_role: workers
-
-# Allowing empty roles
-#
-# Whether roles with no servers are allowed. Defaults to `false`.
-allow_empty_roles: false
-
-# Stop wait time
-#
-# How long we wait for a container to stop before killing it, defaults to 30 seconds
-stop_wait_time: 60
-
-# Retain containers
-#
-# How many old containers and images we retain, defaults to 5
-retain_containers: 3
-
-# Minimum version
-#
-# The minimum version of Kamal required to deploy this configuration, defaults to nil
-minimum_version: 1.3.0
-
-# Readiness delay
-#
-# Seconds to wait for a container to boot after is running, default 7
-# This only applies to containers that do not specify a healthcheck
-readiness_delay: 4
-
-# Run directory
-#
-# Directory to store kamal runtime files in on the host, default `.kamal`
-run_directory: /etc/kamal
-
-# SSH options
-#
-# See kamal docs ssh
-ssh:
-  ...
-
-# Builder options
-#
-# See kamal docs builder
-builder:
-  ...
-
-# Accessories
-#
-# Additionals services to run in Docker, see kamal docs accessory
-accessories:
-  ...
-
-# Traefik
-#
-# The Traefik proxy is used for zero-downtime deployments, see kamal docs traefik
-traefik:
-  ...
-
-# Proxy
-#
-# **Experimental** Configuration for kamal-proxy the replacement for Traefik, see kamal docs proxy
-proxy:
-  ...
-
-# SSHKit
-#
-# See kamal docs sshkit
-sshkit:
-  ...
-
-# Boot options
-#
-# See kamal docs boot
-boot:
-  ...
-
-# Healthcheck
-#
-# Configuring healthcheck commands, intervals and timeouts, see kamal docs healthcheck
-healthcheck:
-  ...
-
-# Logging
-#
-# Docker logging configuration, see kamal docs logging
-logging:
-  ...
-
-# Aliases
-#
-# Alias configuration, see kamal docs alias
-aliases:
-  ...

lib/kamal/configuration/docs/env.yml

@@ -1,70 +0,0 @@
-# Environment variables
-#
-# Environment variables can be set directly in the Kamal configuration or
-# loaded from a .env file, for secrets that should not be checked into Git.
-
-# Reading environment variables from the configuration
-#
-# Environment variables can be set directly in the configuration file.
-#
-# These are passed to the docker run command when deploying.
-env:
-  DATABASE_HOST: mysql-db1
-  DATABASE_PORT: 3306
-
-# Using .env file to load required environment variables
-#
-# Kamal uses dotenv to automatically load environment variables set in the .env file present
-# in the application root.
-#
-# This file can be used to set variables like KAMAL_REGISTRY_PASSWORD or database passwords.
-# But for this reason you must ensure that .env files are not checked into Git or included
-# in your Dockerfile! The format is just key-value like:
-# ```
-# KAMAL_REGISTRY_PASSWORD=pw
-# DB_PASSWORD=secret123
-# ```
-#
-# To pass the secrets you should list them under the `secret` key. When you do this the
-# other variables need to be moved under the `clear` key.
-#
-# Unlike clear values, secrets are not passed directly to the container,
-# but are stored in an env file on the host
-env:
-  clear:
-    DB_USER: app
-  secret:
-    - DB_PASSWORD
-
-# Tags
-#
-# Tags are used to add extra env variables to specific hosts.
-# See kamal docs servers for how to tag hosts.
-#
-# Tags are only allowed in the top level env configuration (i.e not under a role specific env).
-#
-# The env variables can be specified with secret and clear values as explained above.
-env:
-  tags:
-    <tag1>:
-      MYSQL_USER: monitoring
-    <tag2>:
-      clear:
-        MYSQL_USER: readonly
-      secret:
-        - MYSQL_PASSWORD
-
-# Example configuration
-env:
-  clear:
-    MYSQL_USER: app
-  secret:
-    - MYSQL_PASSWORD
-  tags:
-    monitoring:
-      MYSQL_USER: monitoring
-    replica:
-      clear:
-        MYSQL_USER: readonly
-      secret:
-        - READONLY_PASSWORD

lib/kamal/configuration/docs/healthcheck.yml

@@ -1,59 +0,0 @@
-# Healthcheck configuration
-#
-# On roles that are running Traefik, Kamal will supply a default healthcheck to `docker run`.
-# For other roles, by default no healthcheck is supplied.
-#
-# If no healthcheck is supplied and the image does not define one, then we wait for the container
-# to reach a running state and then pause for the readiness delay.
-#
-# The default healthcheck is `curl -f http://localhost:<port>/<path>`, so it assumes that `curl`
-# is available within the container.
-
-# Healthcheck options
-#
-# These go under the `healthcheck` key in the root or role configuration.
-healthcheck:
-
-  # Command
-  #
-  # The command to run, defaults to `curl -f http://localhost:<port>/<path>` on roles running Traefik
-  cmd: "curl -f http://localhost"
-
-  # Interval
-  #
-  # The Docker healthcheck interval, defaults to `1s`
-  interval: 10s
-
-  # Max attempts
-  #
-  # The maximum number of times we poll the container to see if it is healthy, defaults to `7`
-  # Each check is separated by an increasing interval starting with 1 second.
-  max_attempts: 3
-
-  # Port
-  #
-  # The port to use in the healthcheck, defaults to `3000`
-  port: "80"
-
-  # Path
-  #
-  # The path to use in the healthcheck, defaults to `/up`
-  path: /health
-
-  # Cords for zero-downtime deployments
-  #
-  # The cord file is used for zero-downtime deployments. The healthcheck is augmented with a check
-  # for the existance of the file. This allows us to delete the file and force the container to
-  # become unhealthy, causing Traefik to stop routing traffic to it.
-  #
-  # Kamal mounts a volume at this location and creates the file before starting the container.
-  # You can set the value to `false` to disable the cord file, but this loses the zero-downtime
-  # guarantee.
-  #
-  # The default value is `/tmp/kamal-cord`
-  cord: /cord
-
-  # Log lines
-  #
-  # Number of lines to log from the container when the healthcheck fails, defaults to `50`
-  log_lines: 100

lib/kamal/configuration/docs/logging.yml

@@ -1,21 +0,0 @@
-# Custom logging configuration
-#
-# Set these to control the Docker logging driver and options.
-
-# Logging settings
-#
-# These go under the logging key in the configuration file.
-#
-# This can be specified in the root level or for a specific role.
-logging:
-
-  # Driver
-  #
-  # The logging driver to use, passed to Docker via `--log-driver`
-  driver: json-file
-
-  # Options
-  #
-  # Any logging options to pass to the driver, passed to Docker via `--log-opt`
-  options:
-    max-size: 100m

lib/kamal/configuration/docs/proxy.yml

@@ -1,127 +0,0 @@
-# Proxy
-#
-# **Experimental** [kamal-proxy](http://github.com/basecamp/kamal-proxy) is a
-# custom built specifically for Kamal. It will replace Traefik in Kamal v2.0,
-# but currently is available as an experimental feature.
-#
-# When this is enabled, the proxy will be started on the hosts listed under the hosts key.
-# In addition, the kamal traefik command will be disabled and replaced by kamal proxy.
-#
-# The kamal proxy command works identically to kamal traefik on hosts that have not
-# been included. It will also handle switching between Traefik and kamal-proxy when you
-# run kamal proxy reboot.
-
-# Limitations
-#
-# Currently the proxy will run on ports 80 and 443 and will bind to those
-# ports on the host.
-#
-# There is no way to set custom options for `docker run` when booting the proxy.
-#
-# If you have custom Traefik configuration via labels or boot arguments they may
-# not have an equivalent in kamal-proxy.
-
-# Proxy settings
-#
-# The proxy is configured in the root configuration under `traefik`. These are
-# options that are set when deploying the application, not when booting the proxy
-#
-# They are application specific, so are not shared when multiple applications
-# with the same proxy.
-proxy:
-
-  # Enabled
-  #
-  # Whether to enable experimental proxy support. Defaults to false
-  enabled: true
-
-  # Hosts
-  #
-  # The hosts to run the proxy on, instead of Traefik
-  # This is a temporary setting and will be removed when we full switch to kamal-proxy
-  #
-  # If you run `kamal traefik reboot`, then the proxy will be started on these hosts
-  # in place of traefik.
-  hosts:
-    - 10.0.0.1
-    - 10.0.0.2
-
-  # Host
-  #
-  # This is the host that will be used to serve the app. By setting this you can run
-  # multiple apps on the same server sharing the same instance of the proxy.
-  #
-  # If this is set only requests that match this host will be forwarded by the proxy.
-  # if this is not set, then all requests will be forwarded, except for matching
-  # requests for other apps that do have a host set.
-  host: foo.example.com
-
-  # App port
-  #
-  # The port the application container is exposed on
-  # Defaults to 80
-  app_port: 3000
-
-  # SSL
-  #
-  # Kamal Proxy can automatically obtain and renew TLS certificates for your applications.
-  # To ensure this set, the ssl flag. This only works if we are deploying to one server and
-  # the host flag is set.
-  ssl: true
-
-  # Deploy timeout
-  #
-  # How long to wait for the app to boot when deploying, defaults to 30 seconds
-  deploy_timeout: 10s
-
-  # Response timeout
-  #
-  # How long to wait for requests to complete before timing out, defaults to 30 seconds
-  response_timeout: 10
-
-  # Healthcheck
-  #
-  # When deploying, the proxy will by default hit /up once every second until we hit
-  # the deploy timeout, with a 5 second timeout for each request.
-  #
-  # Once the app is up, the proxy will stop hitting the healthcheck endpoint.
-  healthcheck:
-    interval: 3
-    path: /health
-    timeout: 3
-
-  # Buffering
-  #
-  # Whether to buffer request and response bodies in the proxy
-  #
-  # By default buffering is enabled with a max request body size of 1GB and no limit
-  # for response size.
-  #
-  # You can also set the memory limit for buffering, which defaults to 1MB, anything
-  # larger than that is written to disk.
-  buffering:
-    requests: true
-    responses: true
-    max_request_body: 40_000_000
-    max_response_body: 0
-    memory: 2_000_000
-
-  # Logging
-  #
-  # Configure request logging for the proxy
-  # You can specify request and response headers to log.
-  # By default, Cache-Control and Last-Modified request headers are logged
-  logging:
-    request_headers:
-      - Cache-Control
-      - X-Forwarded-Proto
-    response_headers:
-      - X-Request-ID
-      - X-Request-Start
-
-  # Forward headers
-  #
-  # Whether to forward the X-Forwarded-For and X-Forwarded-Proto headers (defaults to false)
-  #
-  # If you are behind a trusted proxy, you can set this to true to forward the headers.
-  forward_headers: true

lib/kamal/configuration/docs/registry.yml

@@ -1,49 +0,0 @@
-# Registry
-#
-# The default registry is Docker Hub, but you can change it using registry/server:
-#
-# A reference to secret (in this case DOCKER_REGISTRY_TOKEN) will look up the secret
-# in the local environment.
-
-registry:
-  server: registry.digitalocean.com
-  username:
-    - DOCKER_REGISTRY_TOKEN
-  password:
-    - DOCKER_REGISTRY_TOKEN
-
-# Using AWS ECR as the container registry
-# You will need to have the aws CLI installed locally for this to work.
-# AWS ECR’s access token is only valid for 12hrs. In order to not have to manually regenerate the token every time, you can use ERB in the deploy.yml file to shell out to the aws cli command, and obtain the token:
-
-registry:
-  server: <your aws account id>.dkr.ecr.<your aws region id>.amazonaws.com
-  username: AWS
-  password: <%= %x(aws ecr get-login-password) %>
-
-# Using GCP Artifact Registry as the container registry
-# To sign into Artifact Registry, you would need to
-# [create a service account](https://cloud.google.com/iam/docs/service-accounts-create#creating)
-# and [set up roles and permissions](https://cloud.google.com/artifact-registry/docs/access-control#permissions).
-# Normally, assigning a roles/artifactregistry.writer role should be sufficient.
-#
-# Once the service account is ready, you need to generate and download a JSON key, base64 encode it and add to .env:
-#
-# ```shell
-# echo "KAMAL_REGISTRY_PASSWORD=$(base64 -i /path/to/key.json)" | tr -d "\\n"  >> .env
-# ```
-# Use the env variable as password along with _json_key_base64 as username.
-# Here’s the final configuration:
-
-registry:
-  server: <your registry region>-docker.pkg.dev
-  username: _json_key_base64
-  password:
-    - KAMAL_REGISTRY_PASSWORD
-
-# Validating the configuration
-#
-# You can validate the configuration by running:
-# ```shell
-# kamal registry login
-# ```

lib/kamal/configuration/docs/role.yml

@@ -1,52 +0,0 @@
-# Roles
-#
-# Roles are used to configure different types of servers in the deployment.
-# The most common use for this is to run a web servers and job servers.
-#
-# Kamal expects there to be a `web` role, unless you set a different `primary_role`
-# in the root configuration.
-
-# Role configuration
-#
-# Roles are specified under the servers key
-servers:
-
-  # Simple role configuration
-  #
-  #
-  # This can be a list of hosts, if you don't need custom configuration for the role.
-  #
-  # You can set tags on the hosts for custom env variables (see kamal docs env)
-  web:
-    - 172.1.0.1
-    - 172.1.0.2: experiment1
-    - 172.1.0.2: [ experiment1, experiment2 ]
-
-  # Custom role configuration
-  #
-  # When there are other options to set, the list of hosts goes under the `hosts` key
-  #
-  # By default only the primary role uses Traefik, but you can set `traefik` to change
-  # it.
-  #
-  # You can also set a custom cmd to run in the container, and overwrite other settings
-  # from the root configuration.
-  workers:
-    hosts:
-      - 172.1.0.3
-      - 172.1.0.4: experiment1
-    traefik: true
-    cmd: "bin/jobs"
-    options:
-      memory: 2g
-      cpus: 4
-    healthcheck:
-      ...
-    logging:
-      ...
-    labels:
-      my-label: workers
-    env:
-      ...
-    asset_path: /public
-

lib/kamal/configuration/docs/servers.yml

@@ -1,27 +0,0 @@
-# Servers
-#
-# Servers are split into different roles, with each role having its own configuration.
-#
-# For simpler deployments though where all servers are identical, you can just specify a list of servers
-# They will be implicitly assigned to the `web` role.
-servers:
-  - 172.0.0.1
-  - 172.0.0.2
-  - 172.0.0.3
-
-# Tagging servers
-#
-# Servers can be tagged, with the tags used to add custom env variables (see kamal docs env).
-servers:
-  - 172.0.0.1
-  - 172.0.0.2: experiments
-  - 172.0.0.3: [ experiments, three ]
-
-# Roles
-#
-# For more complex deployments (e.g. if you are running job hosts), you can specify roles, and configure each separately (see kamal docs role)
-servers:
-  web:
-    ...
-  workers:
-    ...

lib/kamal/configuration/docs/ssh.yml

@@ -1,66 +0,0 @@
-# SSH configuration
-#
-# Kamal uses SSH to connect run commands on your hosts.
-# By default it will attempt to connect to the root user on port 22
-#
-# If you are using non-root user, you may need to bootstrap your servers manually, before using them with Kamal. On Ubuntu, you’d do:
-#
-# ```shell
-# sudo apt update
-# sudo apt upgrade -y
-# sudo apt install -y docker.io curl git
-# sudo usermod -a -G docker app
-# ```
-
-
-# SSH options
-#
-# The options are specified under the ssh key in the configuration file.
-ssh:
-
-  # The SSH user
-  #
-  # Defaults to `root`
-  #
-  user: app
-
-  # The SSH port
-  #
-  # Defaults to 22
-  port: "2222"
-
-  # Proxy host
-  #
-  # Specified in the form <host> or <user>@<host>
-  proxy: root@proxy-host
-
-  # Proxy command
-  #
-  # A custom proxy command, required for older versions of SSH
-  proxy_command: "ssh -W %h:%p user@proxy"
-
-  # Log level
-  #
-  # Defaults to `fatal`. Set this to debug if you are having
-  # SSH connection issues.
-  log_level: debug
-
-  # Keys Only
-  #
-  # Set to true to use only private keys from keys and key_data parameters, 
-  # even if ssh-agent offers more identities. This option is intended for 
-  # situations where ssh-agent offers many different identites or you have 
-  # a need to overwrite all identites and force a single one.
-  keys_only: false
-
-  # Keys
-  #
-  # An array of file names of private keys to use for publickey
-  # and hostbased authentication
-  keys: [ "~/.ssh/id.pem" ]
-
-  # Key Data
-  #
-  # An array of strings, with each element of the array being
-  # a raw private key in PEM format.
-  key_data: [ "-----BEGIN OPENSSH PRIVATE KEY-----" ]

lib/kamal/configuration/docs/sshkit.yml

@@ -1,23 +0,0 @@
-# SSHKit
-#
-# [SSHKit](https://github.com/capistrano/sshkit) is the SSH toolkit used by Kamal.
-#
-# The default settings should be sufficient for most use cases, but
-# when connecting to a large number of hosts you may need to adjust
-
-# SSHKit options
-#
-# The options are specified under the sshkit key in the configuration file.
-sshkit:
-
-  # Max concurrent starts
-  #
-  # Creating SSH connections concurrently can be an issue when deploying to many servers.
-  # By default Kamal will limit concurrent connection starts to 30 at a time.
-  max_concurrent_starts: 10
-
-  # Pool idle timeout
-  #
-  # Kamal sets a long idle timeout of 900 seconds on connections to try to avoid
-  # re-connection storms after an idle period, like building an image or waiting for CI.
-  pool_idle_timeout: 300

lib/kamal/configuration/docs/traefik.yml

@@ -1,62 +0,0 @@
-# Traefik
-#
-# Traefik is a reverse proxy, used by Kamal for zero-downtime deployments.
-#
-# We start an instance on the hosts in it's own container.
-#
-# During a deployment:
-# 1. We start a new container which Traefik automatically detects due to the labels we have applied
-# 2. Traefik starts routing traffic to the new container
-# 3. We force the old container to fail it's healthcheck, causing Traefik to stop routing traffic to it
-# 4. We stop the old container
-
-# Traefik settings
-#
-# Traekik is configured in the root configuration under `traefik`.
-traefik:
-
-  # Image
-  #
-  # The Traefik image to use, defaults to `traefik:v2.10`
-  image: traefik:v2.9
-
-  # Host port
-  #
-  # The host port to publish the Traefik container on, defaults to `80`
-  host_port: "8080"
-
-  # Disabling publishing
-  #
-  # To avoid publishing the Traefik container, set this to `false`
-  publish: false
-
-  # Labels
-  #
-  # Additional labels to apply to the Traefik container
-  labels:
-    traefik.http.routers.catchall.entryPoints: http
-    traefik.http.routers.catchall.rule: PathPrefix(`/`)
-    traefik.http.routers.catchall.service: unavailable
-    traefik.http.routers.catchall.priority: "1"
-    traefik.http.services.unavailable.loadbalancer.server.port: "0"
-
-  # Arguments
-  #
-  # Additional arguments to pass to the Traefik container
-  args:
-    entryPoints.http.address: ":80"
-    entryPoints.http.forwardedHeaders.insecure: true
-    accesslog: true
-    accesslog.format: json
-
-  # Options
-  #
-  # Additional options to pass to `docker run`
-  options:
-    cpus: 2
-
-  # Environment variables
-  #
-  # See kamal docs env
-  env:
-    ...

lib/kamal/configuration/env.rb

@@ -1,29 +1,40 @@
 class Kamal::Configuration::Env
-  include Kamal::Configuration::Validation
+  attr_reader :secrets_keys, :clear, :secrets_file
-
-  attr_reader :context, :secrets
-  attr_reader :clear, :secret_keys
   delegate :argumentize, to: Kamal::Utils
 
-  def initialize(config:, secrets:, context: "env")
+  def self.from_config(config:, secrets_file: nil)
-    @clear = config.fetch("clear", config.key?("secret") || config.key?("tags") ? {} : config)
+    secrets_keys = config.fetch("secret", [])
-    @secrets = secrets
+    clear = config.fetch("clear", config.key?("secret") || config.key?("tags") ? {} : config)
-    @secret_keys = config.fetch("secret", [])
+
-    @context = context
+    new clear: clear, secrets_keys: secrets_keys, secrets_file: secrets_file
-    validate! config, context: context, with: Kamal::Configuration::Validator::Env
   end
 
-  def clear_args
+  def initialize(clear:, secrets_keys:, secrets_file:)
-    argumentize("--env", clear)
+    @clear = clear
+    @secrets_keys = secrets_keys
+    @secrets_file = secrets_file
+  end
+
+  def args
+    [ "--env-file", secrets_file, *argumentize("--env", clear) ]
   end
 
   def secrets_io
-    Kamal::EnvFile.new(secret_keys.to_h { |key| [ key, secrets[key] ] }).to_io
+    StringIO.new(Kamal::EnvFile.new(secrets).to_s)
+  end
+
+  def secrets
+    @secrets ||= secrets_keys.to_h { |key| [ key, ENV.fetch(key) ] }
+  end
+
+  def secrets_directory
+    File.dirname(secrets_file)
   end
 
   def merge(other)
     self.class.new \
-      config: { "clear" => clear.merge(other.clear), "secret" => secret_keys | other.secret_keys },
+      clear: @clear.merge(other.clear),
-      secrets: secrets
+      secrets_keys: @secrets_keys | other.secrets_keys,
+      secrets_file: secrets_file
   end
 end

lib/kamal/configuration/env/tag.rb

@@ -1,13 +1,12 @@
 class Kamal::Configuration::Env::Tag
-  attr_reader :name, :config, :secrets
+  attr_reader :name, :config
 
-  def initialize(name, config:, secrets:)
+  def initialize(name, config:)
     @name = name
     @config = config
-    @secrets = secrets
   end
 
   def env
-    Kamal::Configuration::Env.new(config: config, secrets: secrets)
+    Kamal::Configuration::Env.from_config(config: config)
   end
 end

lib/kamal/configuration/healthcheck.rb

@@ -1,63 +0,0 @@
-class Kamal::Configuration::Healthcheck
-  include Kamal::Configuration::Validation
-
-  attr_reader :healthcheck_config
-
-  def initialize(healthcheck_config:, context: "healthcheck")
-    @healthcheck_config = healthcheck_config || {}
-    validate! @healthcheck_config, context: context
-  end
-
-  def merge(other)
-    self.class.new healthcheck_config: healthcheck_config.deep_merge(other.healthcheck_config)
-  end
-
-  def cmd
-    healthcheck_config.fetch("cmd", http_health_check)
-  end
-
-  def port
-    healthcheck_config.fetch("port", 3000)
-  end
-
-  def path
-    healthcheck_config.fetch("path", "/up")
-  end
-
-  def max_attempts
-    healthcheck_config.fetch("max_attempts", 7)
-  end
-
-  def interval
-    healthcheck_config.fetch("interval", "1s")
-  end
-
-  def cord
-    healthcheck_config.fetch("cord", "/tmp/kamal-cord")
-  end
-
-  def log_lines
-    healthcheck_config.fetch("log_lines", 50)
-  end
-
-  def set_port_or_path?
-    healthcheck_config["port"].present? || healthcheck_config["path"].present?
-  end
-
-  def to_h
-    {
-      "cmd" => cmd,
-      "interval" => interval,
-      "max_attempts" => max_attempts,
-      "port" => port,
-      "path" => path,
-      "cord" => cord,
-      "log_lines" => log_lines
-    }
-  end
-
-  private
-    def http_health_check
-      "curl -f #{URI.join("http://localhost:#{port}", path)} || exit 1" if path.present? || port.present?
-    end
-end

lib/kamal/configuration/logging.rb

@@ -1,33 +0,0 @@
-class Kamal::Configuration::Logging
-  delegate :optionize, :argumentize, to: Kamal::Utils
-
-  include Kamal::Configuration::Validation
-
-  attr_reader :logging_config
-
-  def initialize(logging_config:, context: "logging")
-    @logging_config = logging_config || {}
-    validate! @logging_config, context: context
-  end
-
-  def driver
-    logging_config["driver"]
-  end
-
-  def options
-    logging_config.fetch("options", {})
-  end
-
-  def merge(other)
-    self.class.new logging_config: logging_config.deep_merge(other.logging_config)
-  end
-
-  def args
-    if driver.present? || options.present?
-      optionize({ "log-driver" => driver }.compact) +
-        argumentize("--log-opt", options)
-    else
-      argumentize("--log-opt", { "max-size" => "10m" })
-    end
-  end
-end

lib/kamal/configuration/proxy.rb

@@ -1,80 +1,50 @@
 class Kamal::Configuration::Proxy
-  include Kamal::Configuration::Validation
-
   DEFAULT_HTTP_PORT = 80
   DEFAULT_HTTPS_PORT = 443
   DEFAULT_IMAGE = "basecamp/kamal-proxy:latest"
-  DEFAULT_LOG_REQUEST_HEADERS = [ "Cache-Control", "Last-Modified" ]
 
   delegate :argumentize, :optionize, to: Kamal::Utils
 
   def initialize(config:)
-    @config = config
+    @options = config.raw_config.proxy || {}
-    @proxy_config = config.raw_config.proxy || {}
-    validate! proxy_config, with: Kamal::Configuration::Validator::Proxy
-  end
-
-  def enabled?
-    !!proxy_config.fetch("enabled", false)
-  end
-
-  def hosts
-    if enabled?
-      proxy_config.fetch("hosts", [])
-    else
-      []
-    end
-  end
-
-  def app_port
-    proxy_config.fetch("app_port", 80)
   end
 
   def image
-    proxy_config.fetch("image", DEFAULT_IMAGE)
+    options.fetch("image", DEFAULT_IMAGE)
+  end
+
+  def debug?
+    !!options[:debug]
+  end
+
+  def http_port
+    options.fetch(:http_port, DEFAULT_HTTP_PORT)
+  end
+
+  def https_port
+    options.fetch(:http_port, DEFAULT_HTTPS_PORT)
   end
 
   def container_name
     "kamal-proxy"
   end
 
-  def publish_args
+  def docker_options_args
-    argumentize "--publish", [ "#{DEFAULT_HTTP_PORT}:#{DEFAULT_HTTP_PORT}", "#{DEFAULT_HTTPS_PORT}:#{DEFAULT_HTTPS_PORT}" ]
+    optionize(options.fetch("options", {}))
   end
 
-  def ssl?
+  def publish_args
-    proxy_config.fetch("ssl", false)
+    argumentize "--publish", [ *("#{http_port}:#{DEFAULT_HTTP_PORT}" if http_port), *("#{https_port}:#{DEFAULT_HTTPS_PORT}" if https_port) ]
   end
 
   def deploy_options
-    {
+    options.fetch(:deploy, {})
-      host: proxy_config["host"],
-      tls: proxy_config["ssl"],
-      "deploy-timeout": proxy_config["deploy_timeout"],
-      "drain-timeout": proxy_config["drain_timeout"],
-      "health-check-interval": proxy_config.dig("health_check", "interval"),
-      "health-check-timeout": proxy_config.dig("health_check", "timeout"),
-      "health-check-path": proxy_config.dig("health_check", "path"),
-      "target-timeout": proxy_config["response_timeout"],
-      "buffer-requests": proxy_config.fetch("buffering", { "requests": true }).fetch("requests", true),
-      "buffer-responses": proxy_config.fetch("buffering", { "responses": true }).fetch("responses", true),
-      "buffer-memory": proxy_config.dig("buffering", "memory"),
-      "max-request-body": proxy_config.dig("buffering", "max_request_body"),
-      "max-response-body": proxy_config.dig("buffering", "max_response_body"),
-      "forward-headers": proxy_config.dig("forward_headers"),
-      "log-request-header": proxy_config.dig("logging", "request_headers") || DEFAULT_LOG_REQUEST_HEADERS,
-      "log-response-header": proxy_config.dig("logging", "response_headers")
-    }.compact
   end
 
   def deploy_command_args
     optionize deploy_options
   end
 
-  def config_directory_as_docker_volume
-    File.join config.run_directory_as_docker_volume, "proxy", "config"
-  end
-
   private
-    attr_reader :config, :proxy_config
+    attr_accessor :options
 end

lib/kamal/configuration/registry.rb

@@ -1,32 +0,0 @@
-class Kamal::Configuration::Registry
-  include Kamal::Configuration::Validation
-
-  attr_reader :registry_config, :secrets
-
-  def initialize(config:)
-    @registry_config = config.raw_config.registry || {}
-    @secrets = config.secrets
-    validate! registry_config, with: Kamal::Configuration::Validator::Registry
-  end
-
-  def server
-    registry_config["server"]
-  end
-
-  def username
-    lookup("username")
-  end
-
-  def password
-    lookup("password")
-  end
-
-  private
-    def lookup(key)
-      if registry_config[key].is_a?(Array)
-        secrets[registry_config[key].first]
-      else
-        registry_config[key]
-      end
-    end
-end

lib/kamal/configuration/role.rb

@@ -1,33 +1,12 @@
 class Kamal::Configuration::Role
-  include Kamal::Configuration::Validation
-
-  CORD_FILE = "cord"
   delegate :argumentize, :optionize, to: Kamal::Utils
 
-  attr_reader :name, :config, :specialized_env, :specialized_logging, :specialized_healthcheck
+  attr_accessor :name
-
   alias to_s name
 
   def initialize(name, config:)
     @name, @config = name.inquiry, config
-    validate! \
+    @tagged_hosts ||= extract_tagged_hosts_from_config
-      specializations,
-      example: validation_yml["servers"]["workers"],
-      context: "servers/#{name}",
-      with: Kamal::Configuration::Validator::Role
-
-    @specialized_env = Kamal::Configuration::Env.new \
-      config: specializations.fetch("env", {}),
-      secrets: config.secrets,
-      context: "servers/#{name}/env"
-
-    @specialized_logging = Kamal::Configuration::Logging.new \
-      logging_config: specializations.fetch("logging", {}),
-      context: "servers/#{name}/logging"
-
-    @specialized_healthcheck = Kamal::Configuration::Healthcheck.new \
-      healthcheck_config: specializations.fetch("healthcheck", {}),
-      context: "servers/#{name}/healthcheck"
   end
 
   def primary_host
@@ -55,10 +34,6 @@ class Kamal::Configuration::Role
   end
 
   def labels
-    default_labels.merge(traefik_labels).merge(custom_labels)
-  end
-
-  def labels_for_proxy
     default_labels.merge(custom_labels)
   end
 
@@ -66,38 +41,26 @@ class Kamal::Configuration::Role
     argumentize "--label", labels
   end
 
-  def label_args_for_proxy
-    argumentize "--label", labels_for_proxy
-  end
-
   def logging_args
-    logging.args
+    args = config.logging || {}
-  end
+    args.deep_merge!(specializations["logging"]) if specializations["logging"].present?
 
-  def logging
+    if args.any?
-    @logging ||= config.logging.merge(specialized_logging)
+      optionize({ "log-driver" => args["driver"] }.compact) +
+        argumentize("--log-opt", args["options"])
+    else
+      config.logging_args
+    end
   end
 
 
   def env(host)
     @envs ||= {}
-    @envs[host] ||= [ config.env, specialized_env, *env_tags(host).map(&:env) ].reduce(:merge)
+    @envs[host] ||= [ base_env, specialized_env, *env_tags(host).map(&:env) ].reduce(:merge)
   end
 
   def env_args(host)
-    [ *env(host).clear_args, *argumentize("--env-file", secrets_path) ]
+    env(host).args
-  end
-
-  def env_directory
-    File.join(config.env_directory, "roles")
-  end
-
-  def secrets_io(host)
-    env(host).secrets_io
-  end
-
-  def secrets_path
-    File.join(config.env_directory, "roles", "#{container_prefix}.env")
   end
 
   def asset_volume_args
@@ -105,38 +68,11 @@ class Kamal::Configuration::Role
   end
 
 
-  def health_check_args(cord: true)
+  def running_proxy?
-    if running_traefik? || healthcheck.set_port_or_path?
+    if specializations["proxy"].nil?
-      if cord && uses_cord?
-        optionize({ "health-cmd" => health_check_cmd_with_cord, "health-interval" => healthcheck.interval })
-          .concat(cord_volume.docker_args)
-      else
-        optionize({ "health-cmd" => healthcheck.cmd, "health-interval" => healthcheck.interval })
-      end
-    else
-      []
-    end
-  end
-
-  def healthcheck
-    @healthcheck ||=
-      if running_traefik?
-        config.healthcheck.merge(specialized_healthcheck)
-      else
-        specialized_healthcheck
-      end
-  end
-
-  def health_check_cmd_with_cord
-    "(#{healthcheck.cmd}) && (stat #{cord_container_file} > /dev/null || exit 1)"
-  end
-
-
-  def running_traefik?
-    if specializations["traefik"].nil?
       primary?
     else
-      specializations["traefik"]
+      specializations["proxy"]
     end
   end
 
@@ -145,35 +81,6 @@ class Kamal::Configuration::Role
   end
 
 
-  def uses_cord?
-    running_traefik? && cord_volume && healthcheck.cmd.present?
-  end
-
-  def cord_host_directory
-    File.join config.run_directory_as_docker_volume, "cords", [ container_prefix, config.run_id ].join("-")
-  end
-
-  def cord_volume
-    if (cord = healthcheck.cord)
-      @cord_volume ||= Kamal::Configuration::Volume.new \
-        host_path: File.join(config.run_directory, "cords", [ container_prefix, config.run_id ].join("-")),
-        container_path: cord
-    end
-  end
-
-  def cord_host_file
-    File.join cord_volume.host_path, CORD_FILE
-  end
-
-  def cord_container_directory
-    health_check_options.fetch("cord", nil)
-  end
-
-  def cord_container_file
-    File.join cord_volume.container_path, CORD_FILE
-  end
-
-
   def container_name(version = nil)
     [ container_prefix, version || config.version ].compact.join("-")
   end
@@ -188,7 +95,7 @@ class Kamal::Configuration::Role
   end
 
   def assets?
-    asset_path.present? && running_traefik?
+    asset_path.present? && running_proxy?
   end
 
   def asset_volume(version = nil)
@@ -207,24 +114,30 @@ class Kamal::Configuration::Role
   end
 
   private
-    def tagged_hosts
+    attr_accessor :config, :tagged_hosts
+
+    def extract_tagged_hosts_from_config
       {}.tap do |tagged_hosts|
         extract_hosts_from_config.map do |host_config|
           if host_config.is_a?(Hash)
+            raise ArgumentError, "Multiple hosts found: #{host_config.inspect}" unless host_config.size == 1
+
             host, tags = host_config.first
             tagged_hosts[host] = Array(tags)
-          elsif host_config.is_a?(String)
+          elsif host_config.is_a?(String) || host_config.is_a?(Symbol)
             tagged_hosts[host_config] = []
+          else
+            raise ArgumentError, "Invalid host config: #{host_config.inspect}"
           end
         end
       end
     end
 
     def extract_hosts_from_config
-      if config.raw_config.servers.is_a?(Array)
+      if config.servers.is_a?(Array)
-        config.raw_config.servers
+        config.servers
       else
-        servers = config.raw_config.servers[name]
+        servers = config.servers[name]
         servers.is_a?(Array) ? servers : Array(servers["hosts"])
       end
     end
@@ -233,39 +146,29 @@ class Kamal::Configuration::Role
       { "service" => config.service, "role" => name, "destination" => config.destination }
     end
 
-    def specializations
-      if config.raw_config.servers.is_a?(Array) || config.raw_config.servers[name].is_a?(Array)
-        {}
-      else
-        config.raw_config.servers[name]
-      end
-    end
-
-    def traefik_labels
-      if running_traefik?
-        {
-          # Setting a service property ensures that the generated service name will be consistent between versions
-          "traefik.http.services.#{traefik_service}.loadbalancer.server.scheme" => "http",
-
-          "traefik.http.routers.#{traefik_service}.rule" => "PathPrefix(`/`)",
-          "traefik.http.routers.#{traefik_service}.priority" => "2",
-          "traefik.http.middlewares.#{traefik_service}-retry.retry.attempts" => "5",
-          "traefik.http.middlewares.#{traefik_service}-retry.retry.initialinterval" => "500ms",
-          "traefik.http.routers.#{traefik_service}.middlewares" => "#{traefik_service}-retry@docker"
-        }
-      else
-        {}
-      end
-    end
-
-    def traefik_service
-      container_prefix
-    end
-
     def custom_labels
       Hash.new.tap do |labels|
         labels.merge!(config.labels) if config.labels.present?
         labels.merge!(specializations["labels"]) if specializations["labels"].present?
       end
     end
+
+    def specializations
+      if config.servers.is_a?(Array) || config.servers[name].is_a?(Array)
+        {}
+      else
+        config.servers[name].except("hosts")
+      end
+    end
+
+    def specialized_env
+      Kamal::Configuration::Env.from_config config: specializations.fetch("env", {})
+    end
+
+    # Secrets are stored in an array, which won't merge by default, so have to do it by hand.
+    def base_env
+      Kamal::Configuration::Env.from_config \
+        config: config.env,
+        secrets_file: File.join(config.host_env_directory, "roles", "#{container_prefix}.env")
+    end
 end

lib/kamal/configuration/servers.rb

@@ -1,18 +0,0 @@
-class Kamal::Configuration::Servers
-  include Kamal::Configuration::Validation
-
-  attr_reader :config, :servers_config, :roles
-
-  def initialize(config:)
-    @config = config
-    @servers_config = config.raw_config.servers
-    validate! servers_config, with: Kamal::Configuration::Validator::Servers
-
-    @roles = role_names.map { |role_name| Kamal::Configuration::Role.new role_name, config: config }
-  end
-
-  private
-    def role_names
-      servers_config.is_a?(Array) ? [ "web" ] : servers_config.keys.sort
-    end
-end

lib/kamal/configuration/ssh.rb

@@ -1,45 +1,28 @@
 class Kamal::Configuration::Ssh
   LOGGER = ::Logger.new(STDERR)
 
-  include Kamal::Configuration::Validation
-
-  attr_reader :ssh_config
-
   def initialize(config:)
-    @ssh_config = config.raw_config.ssh || {}
+    @config = config.raw_config.ssh || {}
-    validate! ssh_config
   end
 
   def user
-    ssh_config.fetch("user", "root")
+    config.fetch("user", "root")
   end
 
   def port
-    ssh_config.fetch("port", 22)
+    config.fetch("port", 22)
   end
 
   def proxy
-    if (proxy = ssh_config["proxy"])
+    if (proxy = config["proxy"])
       Net::SSH::Proxy::Jump.new(proxy.include?("@") ? proxy : "root@#{proxy}")
-    elsif (proxy_command = ssh_config["proxy_command"])
+    elsif (proxy_command = config["proxy_command"])
       Net::SSH::Proxy::Command.new(proxy_command)
     end
   end
 
-  def keys_only
-    ssh_config["keys_only"]
-  end
-
-  def keys
-    ssh_config["keys"]
-  end
-
-  def key_data
-    ssh_config["key_data"]
-  end
-
   def options
-    { user: user, port: port, proxy: proxy, logger: logger, keepalive: true, keepalive_interval: 30, keys_only: keys_only, keys: keys, key_data: key_data }.compact
+    { user: user, port: port, proxy: proxy, logger: logger, keepalive: true, keepalive_interval: 30 }.compact
   end
 
   def to_h
@@ -47,11 +30,13 @@ class Kamal::Configuration::Ssh
   end
 
   private
+    attr_accessor :config
+
     def logger
       LOGGER.tap { |logger| logger.level = log_level }
     end
 
     def log_level
-      ssh_config.fetch("log_level", :fatal)
+      config.fetch("log_level", :fatal)
     end
 end

lib/kamal/configuration/sshkit.rb

@@ -1,22 +1,20 @@
 class Kamal::Configuration::Sshkit
-  include Kamal::Configuration::Validation
-
-  attr_reader :sshkit_config
-
   def initialize(config:)
-    @sshkit_config = config.raw_config.sshkit || {}
+    @options = config.raw_config.sshkit || {}
-    validate! sshkit_config
   end
 
   def max_concurrent_starts
-    sshkit_config.fetch("max_concurrent_starts", 30)
+    options.fetch("max_concurrent_starts", 30)
   end
 
   def pool_idle_timeout
-    sshkit_config.fetch("pool_idle_timeout", 900)
+    options.fetch("pool_idle_timeout", 900)
   end
 
   def to_h
-    sshkit_config
+    options
   end
+
+  private
+    attr_accessor :options
 end

lib/kamal/configuration/traefik.rb

@@ -1,78 +0,0 @@
-class Kamal::Configuration::Traefik
-  delegate :argumentize, to: Kamal::Utils
-
-  DEFAULT_IMAGE = "traefik:v2.10"
-  CONTAINER_PORT = 80
-  DEFAULT_ARGS = {
-    "log.level" => "DEBUG"
-  }
-  DEFAULT_LABELS = {
-    # These ensure we serve a 502 rather than a 404 if no containers are available
-    "traefik.http.routers.catchall.entryPoints" => "http",
-    "traefik.http.routers.catchall.rule" => "PathPrefix(`/`)",
-    "traefik.http.routers.catchall.service" => "unavailable",
-    "traefik.http.routers.catchall.priority" => 1,
-    "traefik.http.services.unavailable.loadbalancer.server.port" => "0"
-  }
-
-  include Kamal::Configuration::Validation
-
-  attr_reader :config, :traefik_config
-
-  def initialize(config:)
-    @config = config
-    @traefik_config = config.raw_config.traefik || {}
-    validate! traefik_config
-  end
-
-  def publish?
-    traefik_config["publish"] != false
-  end
-
-  def labels
-    DEFAULT_LABELS.merge(traefik_config["labels"] || {})
-  end
-
-  def env
-    Kamal::Configuration::Env.new \
-      config: traefik_config.fetch("env", {}),
-      secrets: config.secrets,
-      context: "traefik/env"
-  end
-
-  def host_port
-    traefik_config.fetch("host_port", CONTAINER_PORT)
-  end
-
-  def options
-    traefik_config.fetch("options", {})
-  end
-
-  def port
-    "#{host_port}:#{CONTAINER_PORT}"
-  end
-
-  def args
-    DEFAULT_ARGS.merge(traefik_config.fetch("args", {}))
-  end
-
-  def image
-    traefik_config.fetch("image", DEFAULT_IMAGE)
-  end
-
-  def env_args
-    [ *env.clear_args, *argumentize("--env-file", secrets_path) ]
-  end
-
-  def env_directory
-    File.join(config.env_directory, "traefik")
-  end
-
-  def secrets_io
-    env.secrets_io
-  end
-
-  def secrets_path
-    File.join(config.env_directory, "traefik", "traefik.env")
-  end
-end

lib/kamal/configuration/validation.rb

@@ -1,27 +0,0 @@
-require "yaml"
-require "active_support/inflector"
-
-module Kamal::Configuration::Validation
-  extend ActiveSupport::Concern
-
-  class_methods do
-    def validation_doc
-      @validation_doc ||= File.read(File.join(File.dirname(__FILE__), "docs", "#{validation_config_key}.yml"))
-    end
-
-    def validation_config_key
-      @validation_config_key ||= name.demodulize.underscore
-    end
-  end
-
-  def validate!(config, example: nil, context: nil, with: Kamal::Configuration::Validator)
-    context ||= self.class.validation_config_key
-    example ||= validation_yml[self.class.validation_config_key]
-
-    with.new(config, example: example, context: context).validate!
-  end
-
-  def validation_yml
-    @validation_yml ||= YAML.load(self.class.validation_doc)
-  end
-end

lib/kamal/configuration/validator.rb

@@ -1,169 +0,0 @@
-class Kamal::Configuration::Validator
-  attr_reader :config, :example, :context
-
-  def initialize(config, example:, context:)
-    @config = config
-    @example = example
-    @context = context
-  end
-
-  def validate!
-    validate_against_example! config, example
-  end
-
-  private
-    def validate_against_example!(validation_config, example)
-      validate_type! validation_config, example.class
-
-      if example.class == Hash
-        check_unknown_keys! validation_config, example
-
-        validation_config.each do |key, value|
-          next if extension?(key)
-          with_context(key) do
-            example_value = example[key]
-
-            if example_value == "..."
-              validate_type! value, *(Array if key == :servers), Hash
-            elsif key == "hosts"
-              validate_servers! value
-            elsif example_value.is_a?(Array)
-              if key == "arch"
-                validate_array_of_or_type! value, example_value.first.class
-              else
-                validate_array_of! value, example_value.first.class
-              end
-            elsif example_value.is_a?(Hash)
-              case key.to_s
-              when "options", "args"
-                validate_type! value, Hash
-              when "labels"
-                validate_hash_of! value, example_value.first[1].class
-              else
-                validate_against_example! value, example_value
-              end
-            else
-              validate_type! value, example_value.class
-            end
-          end
-        end
-      end
-    end
-
-
-    def valid_type?(value, type)
-      value.is_a?(type) ||
-        (type == String && stringish?(value)) ||
-        (boolean?(type) && boolean?(value.class))
-    end
-
-    def type_description(type)
-      if type == Integer || type == Array
-        "an #{type.name.downcase}"
-      elsif type == TrueClass || type == FalseClass
-        "a boolean"
-      else
-        "a #{type.name.downcase}"
-      end
-    end
-
-    def boolean?(type)
-      type == TrueClass || type == FalseClass
-    end
-
-    def stringish?(value)
-      value.is_a?(String) || value.is_a?(Symbol) || value.is_a?(Numeric) || value.is_a?(TrueClass) || value.is_a?(FalseClass)
-    end
-
-    def validate_array_of_or_type!(value, type)
-      if value.is_a?(Array)
-        validate_array_of! value, type
-      else
-        validate_type! value, type
-      end
-    rescue Kamal::ConfigurationError
-      type_error(Array, type)
-    end
-
-    def validate_array_of!(array, type)
-      validate_type! array, Array
-
-      array.each_with_index do |value, index|
-        with_context(index) do
-          validate_type! value, type
-        end
-      end
-    end
-
-    def validate_hash_of!(hash, type)
-      validate_type! hash, Hash
-
-      hash.each do |key, value|
-        with_context(key) do
-          validate_type! value, type
-        end
-      end
-    end
-
-    def validate_servers!(servers)
-      validate_type! servers, Array
-
-      servers.each_with_index do |server, index|
-        with_context(index) do
-          validate_type! server, String, Hash
-
-          if server.is_a?(Hash)
-            error "multiple hosts found" unless server.size == 1
-            host, tags = server.first
-
-            with_context(host) do
-              validate_type! tags, String, Array
-              validate_array_of! tags, String if tags.is_a?(Array)
-            end
-          end
-        end
-      end
-    end
-
-    def validate_type!(value, *types)
-      type_error(*types) unless types.any? { |type| valid_type?(value, type) }
-    end
-
-    def error(message)
-      raise Kamal::ConfigurationError, "#{error_context}#{message}"
-    end
-
-    def type_error(*expected_types)
-      error "should be #{expected_types.map { |type| type_description(type) }.join(" or ")}"
-    end
-
-    def unknown_keys_error(unknown_keys)
-      error "unknown #{"key".pluralize(unknown_keys.count)}: #{unknown_keys.join(", ")}"
-    end
-
-    def error_context
-      "#{context}: " if context.present?
-    end
-
-    def with_context(context)
-      old_context = @context
-      @context = [ @context, context ].select(&:present?).join("/")
-      yield
-    ensure
-      @context = old_context
-    end
-
-    def allow_extensions?
-      false
-    end
-
-    def extension?(key)
-      key.to_s.start_with?("x-")
-    end
-
-    def check_unknown_keys!(config, example)
-      unknown_keys = config.keys - example.keys
-      unknown_keys.reject! { |key| extension?(key) } if allow_extensions?
-      unknown_keys_error unknown_keys if unknown_keys.present?
-    end
-end

lib/kamal/configuration/validator/accessory.rb

@@ -1,9 +0,0 @@
-class Kamal::Configuration::Validator::Accessory < Kamal::Configuration::Validator
-  def validate!
-    super
-
-    if (config.keys & [ "host", "hosts", "roles" ]).size != 1
-      error "specify one of `host`, `hosts` or `roles`"
-    end
-  end
-end

lib/kamal/configuration/validator/alias.rb

@@ -1,15 +0,0 @@
-class Kamal::Configuration::Validator::Alias < Kamal::Configuration::Validator
-  def validate!
-    super
-
-    name = context.delete_prefix("aliases/")
-
-    if name !~ /\A[a-z0-9_-]+\z/
-      error "Invalid alias name: '#{name}'. Must only contain lowercase letters, alphanumeric, hyphens and underscores."
-    end
-
-    if Kamal::Cli::Main.commands.include?(name)
-      error "Alias '#{name}' conflicts with a built-in command."
-    end
-  end
-end

lib/kamal/configuration/validator/builder.rb

@@ -1,13 +0,0 @@
-class Kamal::Configuration::Validator::Builder < Kamal::Configuration::Validator
-  def validate!
-    super
-
-    if config["cache"] && config["cache"]["type"]
-      error "Invalid cache type: #{config["cache"]["type"]}" unless [ "gha", "registry" ].include?(config["cache"]["type"])
-    end
-
-    error "Builder arch not set" unless config["arch"].present?
-
-    error "Cannot disable local builds, no remote is set" if config["local"] == false && config["remote"].blank?
-  end
-end

lib/kamal/configuration/validator/configuration.rb

@@ -1,6 +0,0 @@
-class Kamal::Configuration::Validator::Configuration < Kamal::Configuration::Validator
-  private
-    def allow_extensions?
-      true
-    end
-end

lib/kamal/configuration/validator/env.rb

@@ -1,54 +0,0 @@
-class Kamal::Configuration::Validator::Env < Kamal::Configuration::Validator
-  SPECIAL_KEYS = [ "clear", "secret", "tags" ]
-
-  def validate!
-    if known_keys.any?
-      validate_complex_env!
-    else
-      validate_simple_env!
-    end
-  end
-
-  private
-    def validate_simple_env!
-      validate_hash_of!(config, String)
-    end
-
-    def validate_complex_env!
-      unknown_keys_error unknown_keys if unknown_keys.any?
-
-      with_context("clear") { validate_hash_of!(config["clear"], String) } if config.key?("clear")
-      with_context("secret") { validate_array_of!(config["secret"], String) } if config.key?("secret")
-      validate_tags! if config.key?("tags")
-    end
-
-    def known_keys
-      @known_keys ||= config.keys & SPECIAL_KEYS
-    end
-
-    def unknown_keys
-      @unknown_keys ||= config.keys - SPECIAL_KEYS
-    end
-
-    def validate_tags!
-      if context == "env"
-        with_context("tags") do
-          validate_type! config["tags"], Hash
-
-          config["tags"].each do |tag, value|
-            with_context(tag) do
-              validate_type! value, Hash
-
-              Kamal::Configuration::Validator::Env.new(
-                value,
-                example: example["tags"].values[1],
-                context: context
-              ).validate!
-            end
-          end
-        end
-      else
-        error "tags are only allowed in the root env"
-      end
-    end
-end

lib/kamal/configuration/validator/proxy.rb

@@ -1,9 +0,0 @@
-class Kamal::Configuration::Validator::Proxy < Kamal::Configuration::Validator
-  def validate!
-    super
-
-    if config["host"].blank? && config["ssl"]
-      error "Must set a host to enable automatic SSL"
-    end
-  end
-end