Fix up tests

.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

@@ -1,7 +1,7 @@
 # Use the official Ruby 3.2.0 Alpine image as the base image
 FROM ruby:3.2.0-alpine
 
-# Install docker/buildx-bin
+# Install  docker/buildx-bin
 COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
 
 # Set the working directory to /kamal
@@ -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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kamal (2.0.0.alpha)
+    kamal (1.7.3)
       activesupport (>= 7.0)
       base64 (~> 0.2)
       bcrypt_pbkdf (~> 1.0)
@@ -9,8 +9,9 @@ PATH
       dotenv (~> 2.8)
       ed25519 (~> 1.2)
       net-ssh (~> 7.0)
-      sshkit (>= 1.23.0, < 2.0)
-      thor (~> 1.3)
+      sshkit (>= 1.22.2, < 2.0)
+      thor (~> 1.2)
+      x25519 (~> 1.0, >= 1.0.10)
       zeitwerk (~> 2.5)
 
 GEM
@@ -153,8 +154,9 @@ 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)
@@ -164,6 +166,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     webrick (1.8.1)
+    x25519 (1.0.10)
     zeitwerk (2.6.12)
 
 PLATFORMS

bin/docs

@@ -17,7 +17,6 @@ end
 
 DOCS = {
   "accessory" => "Accessories",
-  "alias" => "Aliases",
   "boot" => "Booting",
   "builder" => "Builders",
   "configuration" => "Configuration overview",
@@ -68,27 +67,26 @@ class DocWriter
             output.puts
             place = :new_section
           elsif line =~ /^ *#/
-            generate_line(line, heading: place == :new_section)
+            generate_line(line, place: place)
             place = :in_section
           else
             output.puts "```yaml"
-            output.puts line
+            output.print line
             place = :in_yaml
           end
-        when :in_yaml, :in_empty_line_yaml
+        when :in_yaml
           if line =~ /^ *#/
             output.puts "```"
-            generate_line(line, heading: place == :in_empty_line_yaml)
+            generate_line(line, place: :new_section)
             place = :in_section
-          elsif line.empty?
-            place = :in_empty_line_yaml
           else
-            output.puts line
+            output.puts
+            output.print line
           end
         end
       end
 
-      output.puts "```" if place == :in_yaml
+      output.puts "\n```" if place == :in_yaml
     end
 
     def generate_header
@@ -100,7 +98,7 @@ class DocWriter
       output.puts
     end
 
-    def generate_line(line, heading: false)
+    def generate_line(line, place: :in_section)
       line = line.gsub(/^ *#\s?/, "")
 
       if line =~ /(.*)kamal docs ([a-z]*)(.*)/
@@ -111,7 +109,7 @@ class DocWriter
         line = "#{$1}[#{titlify($2.split("/").last)}](#{$2})#{$3}"
       end
 
-      if heading
+      if place == :new_section
         output.puts "## [#{line}](##{linkify(line)})"
       else
         output.puts line

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,12 +12,13 @@ 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", "~> 2.8"
   spec.add_dependency "zeitwerk", "~> 2.5"
   spec.add_dependency "ed25519", "~> 1.2"
+  spec.add_dependency "x25519", "~> 1.0", ">= 1.0.10"
   spec.add_dependency "bcrypt_pbkdf", "~> 1.0"
   spec.add_dependency "concurrent-ruby", "~> 1.2"
   spec.add_dependency "base64", "~> 0.2"

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

@@ -71,12 +71,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)
-    cmd = Kamal::Utils.join_commands(cmd)
+  def exec(cmd)
     env = options[:env]
     case
     when options[:interactive] && options[:reuse]

lib/kamal/cli/base.rb

@@ -6,8 +6,7 @@ module Kamal::Cli
   class Base < Thor
     include SSHKit::DSL
 
-    def self.exit_on_failure?() false end
-    def self.dynamic_command_class() Kamal::Cli::Alias::Command end
+    def self.exit_on_failure?() true end
 
     class_option :verbose, type: :boolean, aliases: "-v", desc: "Detailed logging"
     class_option :quiet, type: :boolean, aliases: "-q", desc: "Minimal logging"
@@ -23,26 +22,15 @@ module Kamal::Cli
 
     class_option :skip_hooks, aliases: "-H", type: :boolean, default: false, desc: "Don't run hooks"
 
-    def initialize(args = [], local_options = {}, config = {})
-      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
+    def initialize(*)
+      super
       @original_env = ENV.to_h.dup
-      load_env
+      load_envs
       initialize_commander(options_with_subcommand_class_options)
     end
 
     private
-      def reload_env
-        reset_env
-        load_env
-      end
-
-      def load_env
+      def load_envs
         if destination = options[:destination]
           Dotenv.load(".env.#{destination}", ".env")
         else
@@ -50,27 +38,10 @@ module Kamal::Cli
         end
       end
 
-      def reset_env
-        replace_env @original_env
-      end
-
-      def replace_env(env)
+      def reload_envs
         ENV.clear
-        ENV.update(env)
-      end
-
-      def with_original_env
-        keeping_current_env do
-          reset_env
-          yield
-        end
-      end
-
-      def keeping_current_env
-        current_env = ENV.to_h.dup
-        yield
-      ensure
-        replace_env(current_env)
+        ENV.update(@original_env)
+        load_envs
       end
 
       def options_with_subcommand_class_options

lib/kamal/cli/build.rb

@@ -59,14 +59,11 @@ class Kamal::Cli::Build < Kamal::Cli::Base
 
   desc "pull", "Pull app image from registry onto servers"
   def pull
-    if (first_hosts = mirror_hosts).any?
-      #  Pull on a single host per mirror first to seed them
-      say "Pulling image on #{first_hosts.join(", ")} to seed the #{"mirror".pluralize(first_hosts.count)}...", :magenta
-      pull_on_hosts(first_hosts)
-      say "Pulling image on remaining hosts...", :magenta
-      pull_on_hosts(KAMAL.hosts - first_hosts)
-    else
-      pull_on_hosts(KAMAL.hosts)
+    on(KAMAL.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
 
@@ -134,28 +131,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/main.rb

@@ -191,12 +191,10 @@ class Kamal::Cli::Main < Kamal::Cli::Base
     end
 
     if Pathname.new(File.expand_path(env_template_path)).exist?
-      # Ensure existing env doesn't pollute template evaluation
-      content = with_original_env { ERB.new(File.read(env_template_path), trim_mode: "-").result }
-      File.write(env_path, content, perm: 0600)
+      File.write(env_path, ERB.new(File.read(env_template_path), trim_mode: "-").result, perm: 0600)
 
       unless options[:skip_push]
-        reload_env
+        reload_envs
         invoke "kamal:cli:env:push", options
       end
     else

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)
-    cmd = Kamal::Utils.join_commands(cmd)
+  def exec(cmd)
     hosts = KAMAL.hosts | KAMAL.accessory_hosts
 
     case

lib/kamal/commander.rb

@@ -27,11 +27,7 @@ class Kamal::Commander
 
   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
+    self.specific_hosts = [ config.primary_host ]
   end
 
   def specific_roles=(role_names)
@@ -117,10 +113,6 @@ class Kamal::Commander
     @traefik ||= Kamal::Commands::Traefik.new(config)
   end
 
-  def alias(name)
-    config.aliases[name]
-  end
-
 
   def with_verbosity(level)
     old_level = self.verbosity

lib/kamal/commands/builder.rb

@@ -2,7 +2,7 @@ require "active_support/core_ext/string/filters"
 
 class Kamal::Commands::Builder < Kamal::Commands::Base
   delegate :create, :remove, :push, :clean, :pull, :info, :context_hosts, :config_context_hosts, :validate_image,
-           :first_mirror, to: :target
+    to: :target
 
   include Clone
 

lib/kamal/commands/builder/base.rb

@@ -40,10 +40,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
       [ "-t", config.absolute_image, "-t", config.latest_image ]

lib/kamal/configuration.rb

@@ -11,7 +11,7 @@ class Kamal::Configuration
   delegate :argumentize, :optionize, to: Kamal::Utils
 
   attr_reader :destination, :raw_config
-  attr_reader :accessories, :aliases, :boot, :builder, :env, :healthcheck, :logging, :traefik, :servers, :ssh, :sshkit, :registry
+  attr_reader :accessories, :boot, :builder, :env, :healthcheck, :logging, :traefik, :servers, :ssh, :sshkit, :registry
 
   include Validation
 
@@ -47,14 +47,13 @@ class Kamal::Configuration
     @destination = destination
     @declared_version = version
 
-    validate! raw_config, example: validation_yml.symbolize_keys, context: "", with: Kamal::Configuration::Validator::Configuration
+    validate! raw_config, example: validation_yml.symbolize_keys, context: ""
 
     # 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 || {})

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/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/configuration.yml

@@ -2,24 +2,13 @@
 #
 # 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 available configuration options are explained below.
 
 # The service name
 # This is a required value. It is used as the container name prefix.
@@ -166,9 +155,3 @@ healthcheck:
 # Docker logging configuration, see kamal docs logging
 logging:
   ...
-
-# Aliases
-#
-# Alias configuration, see kamal docs alias
-aliases:
-  ...

lib/kamal/configuration/docs/env.yml

@@ -29,7 +29,7 @@ env:
 # 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,
+# Unlike clear valies, secrets are not passed directly to the container,
 # but are stored in an env file on the host
 # The file is not updated when deploying, only when running `kamal envify` or `kamal env push`.
 env:

lib/kamal/configuration/docs/ssh.yml

@@ -44,23 +44,3 @@ ssh:
   # 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/ssh.rb

@@ -26,20 +26,8 @@ class Kamal::Configuration::Ssh
     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

lib/kamal/configuration/validator.rb

@@ -13,34 +13,33 @@ class Kamal::Configuration::Validator
 
   private
     def validate_against_example!(validation_config, example)
-      validate_type! validation_config, example.class
+      validate_type! validation_config, Hash
 
-      if example.class == Hash
-        check_unknown_keys! validation_config, example
+      if (unknown_keys = validation_config.keys - example.keys).any?
+        unknown_keys_error unknown_keys
+      end
 
-        validation_config.each do |key, value|
-          next if extension?(key)
-          with_context(key) do
-            example_value = example[key]
+      validation_config.each do |key, value|
+        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)
-              validate_array_of! value, example_value.first.class
-            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
+          if example_value == "..."
+            validate_type! value, *(Array if key == :servers), Hash
+          elsif key == "hosts"
+            validate_servers! value
+          elsif example_value.is_a?(Array)
+            validate_array_of! value, example_value.first.class
+          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_type! value, example_value.class
+              validate_against_example! value, example_value
             end
+          else
+            validate_type! value, example_value.class
           end
         end
       end
@@ -138,18 +137,4 @@ class Kamal::Configuration::Validator
     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/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/configuration.rb

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

lib/kamal/git.rb

@@ -9,10 +9,6 @@ module Kamal::Git
     `git config user.name`.strip
   end
 
-  def email
-    `git config user.email`.strip
-  end
-
   def revision
     `git rev-parse HEAD`.strip
   end

lib/kamal/tags.rb

@@ -10,7 +10,7 @@ class Kamal::Tags
 
     def default_tags(config)
       { recorded_at: Time.now.utc.iso8601,
-        performer: Kamal::Git.email.presence || `whoami`.chomp,
+        performer: `whoami`.chomp,
         destination: config.destination,
         version: config.version,
         service_version: service_version(config),

lib/kamal/utils.rb

@@ -77,8 +77,4 @@ module Kamal::Utils
   def stable_sort!(elements, &block)
     elements.sort_by!.with_index { |element, index| [ block.call(element), index ] }
   end
-
-  def join_commands(commands)
-    commands.map(&:strip).join(" ")
-  end
 end

lib/kamal/version.rb

@@ -1,3 +1,3 @@
 module Kamal
-  VERSION = "2.0.0.alpha"
+  VERSION = "1.7.3"
 end

test/cli/app_test.rb

@@ -247,12 +247,6 @@ class CliAppTest < CliTestCase
     end
   end
 
-  test "exec separate arguments" do
-    run_command("exec", "ruby", " -v").tap do |output|
-      assert_match "docker run --rm --env-file .kamal/env/roles/app-web.env dhh/app:latest ruby -v", output
-    end
-  end
-
   test "exec with reuse" do
     run_command("exec", "--reuse", "ruby -v").tap do |output|
       assert_match "sh -c 'docker ps --latest --format '\\''{{.Names}}'\\'' --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting --filter ancestor=$(docker image ls --filter reference=dhh/app:latest --format '\\''{{.ID}}'\\'') ; docker ps --latest --format '\\''{{.Names}}'\\'' --filter label=service=app --filter label=role=web --filter status=running --filter status=restarting' | head -1 | while read line; do echo ${line#app-web-}; done", output # Get current version

test/cli/build_test.rb

@@ -170,41 +170,12 @@ class CliBuildTest < CliTestCase
 
   test "pull" do
     run_command("pull").tap do |output|
-      assert_match /docker info --format '{{index .RegistryConfig.Mirrors 0}}'/, output
       assert_match /docker image rm --force dhh\/app:999/, output
       assert_match /docker pull dhh\/app:999/, output
       assert_match "docker inspect -f '{{ .Config.Labels.service }}' dhh/app:999 | grep -x app || (echo \"Image dhh/app:999 is missing the 'service' label\" && exit 1)", output
     end
   end
 
-  test "pull with mirror" do
-    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
-      .with(:docker, :info, "--format '{{index .RegistryConfig.Mirrors 0}}'")
-      .returns("registry-mirror.example.com")
-      .at_least_once
-
-    run_command("pull").tap do |output|
-      assert_match /Pulling image on 1\.1\.1\.\d to seed the mirror\.\.\./, output
-      assert_match "Pulling image on remaining hosts...", output
-      assert_equal 4, output.scan(/docker pull dhh\/app:999/).size, output
-      assert_match "docker inspect -f '{{ .Config.Labels.service }}' dhh/app:999 | grep -x app || (echo \"Image dhh/app:999 is missing the 'service' label\" && exit 1)", output
-    end
-  end
-
-  test "pull with mirrors" do
-    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
-      .with(:docker, :info, "--format '{{index .RegistryConfig.Mirrors 0}}'")
-      .returns("registry-mirror.example.com", "registry-mirror2.example.com")
-      .at_least_once
-
-    run_command("pull").tap do |output|
-      assert_match /Pulling image on 1\.1\.1\.\d, 1\.1\.1\.\d to seed the mirrors\.\.\./, output
-      assert_match "Pulling image on remaining hosts...", output
-      assert_equal 4, output.scan(/docker pull dhh\/app:999/).size, output
-      assert_match "docker inspect -f '{{ .Config.Labels.service }}' dhh/app:999 | grep -x app || (echo \"Image dhh/app:999 is missing the 'service' label\" && exit 1)", output
-    end
-  end
-
   test "create" do
     run_command("create").tap do |output|
       assert_match /docker buildx create --use --name kamal-app-multiarch/, output

test/cli/cli_test_case.rb

@@ -42,13 +42,12 @@ class CliTestCase < ActiveSupport::TestCase
     end
 
     def assert_hook_ran(hook, output, version:, service_version:, hosts:, command:, subcommand: nil, runtime: false)
-      whoami = `whoami`.chomp
-      performer = Kamal::Git.email.presence || whoami
+      performer = `whoami`.strip
       service = service_version.split("@").first
 
       assert_match "Running the #{hook} hook...\n", output
 
-      expected = %r{Running\s/usr/bin/env\s\.kamal/hooks/#{hook}\sas\s#{whoami}@localhost\n\s
+      expected = %r{Running\s/usr/bin/env\s\.kamal/hooks/#{hook}\sas\s#{performer}@localhost\n\s
         DEBUG\s\[[0-9a-f]*\]\sCommand:\s\(\sexport\s
         KAMAL_RECORDED_AT=\"\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\dZ\"\s
         KAMAL_PERFORMER=\"#{performer}\"\s
@@ -63,12 +62,4 @@ class CliTestCase < ActiveSupport::TestCase
 
       assert_match expected, output
     end
-
-    def with_argv(*argv)
-      old_argv = ARGV
-      ARGV.replace(*argv)
-      yield
-    ensure
-      ARGV.replace(old_argv)
-    end
 end

test/cli/main_test.rb

@@ -1,9 +1,6 @@
 require_relative "cli_test_case"
 
 class CliMainTest < CliTestCase
-  setup { @original_env = ENV.to_h.dup }
-  teardown { ENV.clear; ENV.update @original_env }
-
   test "setup" do
     invoke_options = { "config_file" => "test/fixtures/deploy_simple.yml", "version" => "999", "skip_hooks" => false }
 
@@ -125,11 +122,6 @@ class CliMainTest < CliTestCase
       .with(:docker, :buildx, :inspect, "kamal-app-multiarch", "> /dev/null")
       .returns("")
 
-    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
-      .with(:docker, :info, "--format '{{index .RegistryConfig.Mirrors 0}}'")
-      .returns("")
-      .at_least_once
-
     assert_raises(Kamal::Cli::LockError) do
       run_command("deploy")
     end
@@ -163,11 +155,6 @@ class CliMainTest < CliTestCase
       .with(:docker, :buildx, :inspect, "kamal-app-multiarch", "> /dev/null")
       .returns("")
 
-    SSHKit::Backend::Abstract.any_instance.expects(:capture_with_info)
-      .with(:docker, :info, "--format '{{index .RegistryConfig.Mirrors 0}}'")
-      .returns("")
-      .at_least_once
-
     assert_raises(SSHKit::Runner::ExecuteError) do
       run_command("deploy")
     end
@@ -447,7 +434,7 @@ class CliMainTest < CliTestCase
   end
 
   test "envify" do
-    with_test_dotenv(".env.erb": "HELLO=<%= 'world' %>") do
+    with_test_dot_env_erb(contents: "HELLO=<%= 'world' %>") do
       run_command("envify")
       assert_equal("HELLO=world", File.read(".env"))
     end
@@ -461,14 +448,14 @@ class CliMainTest < CliTestCase
       <% end  -%>
     EOF
 
-    with_test_dotenv(".env.erb": file) do
+    with_test_dot_env_erb(contents: file) do
       run_command("envify")
       assert_equal("HELLO=world\nKEY=value\n", File.read(".env"))
     end
   end
 
   test "envify with destination" do
-    with_test_dotenv(".env.world.erb": "HELLO=<%= 'world' %>") do
+    with_test_dot_env_erb(contents: "HELLO=<%= 'world' %>", file: ".env.world.erb") do
       run_command("envify", "-d", "world", config_file: "deploy_for_dest")
       assert_equal "HELLO=world", File.read(".env.world")
     end
@@ -483,13 +470,6 @@ class CliMainTest < CliTestCase
     run_command("envify", "--skip-push")
   end
 
-  test "envify with clean env" do
-    with_test_dotenv(".env": "HELLO=already", ".env.erb": "HELLO=<%= ENV.fetch 'HELLO', 'never' %>") do
-      run_command("envify", "--skip-push")
-      assert_equal "HELLO=never", File.read(".env")
-    end
-  end
-
   test "remove with confirmation" do
     run_command("remove", "-y", config_file: "deploy_with_accessories").tap do |output|
       assert_match /docker container stop traefik/, output
@@ -537,59 +517,19 @@ class CliMainTest < CliTestCase
     assert_equal Kamal::VERSION, version
   end
 
-  test "run an alias for details" do
-    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:traefik:details")
-    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:app:details")
-    Kamal::Cli::Main.any_instance.expects(:invoke).with("kamal:cli:accessory:details", [ "all" ])
-
-    run_command("info", config_file: "deploy_with_aliases")
-  end
-
-  test "run an alias for a console" do
-    run_command("console", config_file: "deploy_with_aliases").tap do |output|
-      assert_match "docker exec app-console-999 bin/console on 1.1.1.5", output
-      assert_match "App Host: 1.1.1.5", output
-    end
-  end
-
-  test "run an alias for a console overriding role" do
-    run_command("console", "-r", "workers", config_file: "deploy_with_aliases").tap do |output|
-      assert_match "docker exec app-workers-999 bin/console on 1.1.1.3", output
-      assert_match "App Host: 1.1.1.3", output
-    end
-  end
-
-  test "run an alias for a console passing command" do
-    run_command("exec", "bin/job", config_file: "deploy_with_aliases").tap do |output|
-      assert_match "docker exec app-console-999 bin/job on 1.1.1.5", output
-      assert_match "App Host: 1.1.1.5", output
-    end
-  end
-
-  test "append to command with an alias" do
-    run_command("rails", "db:migrate:status", config_file: "deploy_with_aliases").tap do |output|
-      assert_match "docker exec app-console-999 rails db:migrate:status on 1.1.1.5", output
-      assert_match "App Host: 1.1.1.5", output
-    end
-  end
-
   private
     def run_command(*command, config_file: "deploy_simple")
-      with_argv([ *command, "-c", "test/fixtures/#{config_file}.yml" ]) do
-        stdouted { Kamal::Cli::Main.start }
-      end
+      stdouted { Kamal::Cli::Main.start([ *command, "-c", "test/fixtures/#{config_file}.yml" ]) }
     end
 
-    def with_test_dotenv(**files)
+    def with_test_dot_env_erb(contents:, file: ".env.erb")
       Dir.mktmpdir do |dir|
         fixtures_dup = File.join(dir, "test")
         FileUtils.mkdir_p(fixtures_dup)
         FileUtils.cp_r("test/fixtures/", fixtures_dup)
 
         Dir.chdir(dir) do
-          files.each do |filename, contents|
-            File.binwrite(filename.to_s, contents)
-          end
+          File.write(file, contents)
           yield
         end
       end

test/cli/server_test.rb

@@ -3,8 +3,8 @@ require_relative "cli_test_case"
 class CliServerTest < CliTestCase
   test "running a command with exec" do
     SSHKit::Backend::Abstract.any_instance.stubs(:capture)
-      .with("date", verbosity: 1)
-      .returns("Today")
+    .with("date", verbosity: 1)
+    .returns("Today")
 
     hosts = "1.1.1.1".."1.1.1.4"
     run_command("exec", "date").tap do |output|
@@ -15,20 +15,6 @@ class CliServerTest < CliTestCase
     end
   end
 
-  test "running a command with exec multiple arguments" do
-    SSHKit::Backend::Abstract.any_instance.stubs(:capture)
-      .with("date -j", verbosity: 1)
-      .returns("Today")
-
-    hosts = "1.1.1.1".."1.1.1.4"
-    run_command("exec", "date", "-j").tap do |output|
-      hosts.map do |host|
-        assert_match "Running 'date -j' on #{hosts.to_a.join(', ')}...", output
-        assert_match "App Host: #{host}\nToday", output
-      end
-    end
-  end
-
   test "bootstrap already installed" do
     stub_setup
     SSHKit::Backend::Abstract.any_instance.expects(:execute).with(:docker, "-v", raise_on_non_zero_exit: false).returns(true).at_least_once

test/commands/auditor_test.rb

@@ -12,7 +12,7 @@ class CommandsAuditorTest < ActiveSupport::TestCase
     }
 
     @auditor = new_command
-    @performer = Kamal::Git.email.presence || `whoami`.chomp
+    @performer = `whoami`.strip
     @recorded_at = Time.now.utc.iso8601
   end
 

test/commands/builder_test.rb

@@ -200,11 +200,6 @@ class CommandsBuilderTest < ActiveSupport::TestCase
     assert_equal [ "unix:///var/run/docker.sock", "ssh://host" ], command.config_context_hosts
   end
 
-  test "mirror count" do
-    command = new_builder_command
-    assert_equal "docker info --format '{{index .RegistryConfig.Mirrors 0}}'", command.first_mirror.join(" ")
-  end
-
   private
     def new_builder_command(additional_config = {})
       Kamal::Commands::Builder.new(Kamal::Configuration.new(@config.merge(additional_config), version: "123"))

test/commands/hook_test.rb

@@ -11,7 +11,7 @@ class CommandsHookTest < ActiveSupport::TestCase
       traefik: { "args" => { "accesslog.format" => "json", "metrics.prometheus.buckets" => "0.1,0.3,1.2,5.0" } }
     }
 
-    @performer = Kamal::Git.email.presence || `whoami`.chomp
+    @performer = `whoami`.strip
     @recorded_at = Time.now.utc.iso8601
   end
 

test/configuration_test.rb

@@ -344,12 +344,4 @@ class ConfigurationTest < ActiveSupport::TestCase
 
     assert_raises(Kamal::ConfigurationError) { Kamal::Configuration.new(@deploy_with_roles.merge(retain_containers: 0)) }
   end
-
-  test "extensions" do
-    dest_config_file = Pathname.new(File.expand_path("fixtures/deploy_with_extensions.yml", __dir__))
-
-    config = Kamal::Configuration.create_from config_file: dest_config_file
-    assert_equal config.role(:web_tokyo).running_traefik?, true
-    assert_equal config.role(:web_chicago).running_traefik?, true
-  end
 end

test/fixtures/deploy_with_aliases.yml

@@ -1,21 +0,0 @@
-service: app
-image: dhh/app
-servers:
-  web:
-    - 1.1.1.1
-    - 1.1.1.2
-  workers:
-    hosts:
-      - 1.1.1.3
-      - 1.1.1.4
-  console:
-    hosts:
-      - 1.1.1.5
-registry:
-  username: user
-  password: pw
-aliases:
-  info: details
-  console: app exec --reuse -p -r console "bin/console"
-  exec: app exec --reuse -p -r console
-  rails: app exec --reuse -p -r console rails

test/fixtures/deploy_with_extensions.yml

@@ -1,24 +0,0 @@
-
-x-web: &web
-  traefik: true
-
-service: app
-image: dhh/app
-servers:
-  web_chicago:
-    <<: *web
-    hosts:
-      - 1.1.1.1
-      - 1.1.1.2
-  web_tokyo:
-    <<: *web
-    hosts:
-      - 1.1.1.3
-      - 1.1.1.4
-env:
-  REDIS_URL: redis://x/y
-registry:
-  server: registry.digitalocean.com
-  username: user
-  password: pw
-primary_role: web_tokyo

test/integration/docker-compose.yml

@@ -29,6 +29,8 @@ services:
       context: docker/registry
     environment:
       - REGISTRY_HTTP_ADDR=0.0.0.0:4443
+      - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt
+      - REGISTRY_HTTP_TLS_KEY=/certs/domain.key
     volumes:
       - shared:/shared
       - registry:/var/lib/registry/

test/integration/docker/deployer/Dockerfile

@@ -22,6 +22,7 @@ COPY app_with_roles/ app_with_roles/
 
 RUN rm -rf /root/.ssh
 RUN ln -s /shared/ssh /root/.ssh
+RUN mkdir -p /etc/docker/certs.d/registry:4443 && ln -s /shared/certs/domain.crt /etc/docker/certs.d/registry:4443/ca.crt
 
 RUN git config --global user.email "deployer@example.com"
 RUN git config --global user.name "Deployer"

test/integration/docker/deployer/app/.kamal/hooks/pre-connect

@@ -1,4 +1,8 @@
 #!/bin/sh
 
 echo "About to lock..."
+if [ "$KAMAL_HOSTS" != "vm1,vm2" ]; then
+  echo "Expected hosts to be 'vm1,vm2', got $KAMAL_HOSTS"
+  exit 1
+fi
 mkdir -p /tmp/${TEST_ID} && touch /tmp/${TEST_ID}/pre-connect

test/integration/docker/deployer/app_with_roles/.kamal/hooks/pre-connect

@@ -1,4 +1,8 @@
 #!/bin/sh
 
 echo "About to lock..."
+if [ "$KAMAL_HOSTS" != "vm1,vm2,vm3" ]; then
+  echo "Expected hosts to be 'vm1,vm2,vm3', got $KAMAL_HOSTS"
+  exit 1
+fi
 mkdir -p /tmp/${TEST_ID} && touch /tmp/${TEST_ID}/pre-connect

test/integration/docker/deployer/app_with_roles/config/deploy.yml

@@ -37,7 +37,3 @@ accessories:
       - web
 stop_wait_time: 1
 readiness_delay: 0
-aliases:
-  whome: version
-  worker_hostname: app exec -r workers -q --reuse hostname
-  uname: server exec -q -p uname

test/integration/docker/deployer/boot.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-dockerd --max-concurrent-downloads 1 --insecure-registry registry:4443 &
+dockerd --max-concurrent-downloads 1 &
 
 exec sleep infinity

test/integration/docker/registry/boot.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
 
+while [ ! -f /certs/domain.crt ]; do sleep 1; done
+
 exec /entrypoint.sh /etc/docker/registry/config.yml

test/integration/docker/shared/Dockerfile

@@ -10,6 +10,8 @@ RUN mkdir ssh && \
 COPY registry-dns.conf .
 COPY boot.sh .
 
+RUN mkdir certs && openssl req -newkey rsa:4096 -nodes -sha256 -keyout certs/domain.key   -x509 -days 365 -out certs/domain.crt   -subj '/CN=registry' -extensions EXT -config registry-dns.conf
+
 HEALTHCHECK --interval=1s CMD pgrep sleep
 
 CMD ["./boot.sh"]

test/integration/docker/vm/Dockerfile

@@ -5,6 +5,7 @@ WORKDIR /work
 RUN apt-get update --fix-missing && apt-get -y install openssh-client openssh-server docker.io
 
 RUN mkdir /root/.ssh && ln -s /shared/ssh/id_rsa.pub /root/.ssh/authorized_keys
+RUN mkdir -p /etc/docker/certs.d/registry:4443 && ln -s /shared/certs/domain.crt /etc/docker/certs.d/registry:4443/ca.crt
 
 RUN echo "HOST_TOKEN=abcd" >> /etc/environment
 

test/integration/docker/vm/boot.sh

@@ -4,6 +4,6 @@ while [ ! -f /root/.ssh/authorized_keys ]; do echo "Waiting for ssh keys"; sleep
 
 service ssh restart
 
-dockerd --max-concurrent-downloads 1 --insecure-registry registry:4443 &
+dockerd --max-concurrent-downloads 1 &
 
 exec sleep infinity

test/integration/main_test.rb

@@ -82,22 +82,6 @@ class MainTest < IntegrationTest
     assert_equal({ "cmd"=>"wget -qO- http://localhost > /dev/null || exit 1", "interval"=>"1s", "max_attempts"=>3, "port"=>3000, "path"=>"/up", "cord"=>"/tmp/kamal-cord", "log_lines"=>50 }, config[:healthcheck])
   end
 
-  test "aliases" do
-    @app = "app_with_roles"
-
-    kamal :envify
-    kamal :deploy
-
-    output = kamal :whome, capture: true
-    assert_equal Kamal::VERSION, output
-
-    output = kamal :worker_hostname, capture: true
-    assert_match /App Host: vm3\nvm3-[0-9a-f]{12}$/, output
-
-    output = kamal :uname, "-o", capture: true
-    assert_match "App Host: vm1\nGNU/Linux", output
-  end
-
   test "setup and remove" do
     # Check remove completes when nothing has been setup yet
     kamal :remove, "-y"