Bump version for 1.8.3

Build both arches with remote multarch builder

.github/workflows/ci.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - 1-8-stable
   pull_request:
 jobs:
   rubocop:

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kamal (2.0.0.alpha)
+    kamal (1.8.3)
       activesupport (>= 7.0)
       base64 (~> 0.2)
       bcrypt_pbkdf (~> 1.0)
@@ -10,7 +10,7 @@ PATH
       ed25519 (~> 1.2)
       net-ssh (~> 7.0)
       sshkit (>= 1.23.0, < 2.0)
-      thor (~> 1.3)
+      thor (~> 1.2)
       zeitwerk (~> 2.5)
 
 GEM

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

kamal.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 7.0"
   spec.add_dependency "sshkit", ">= 1.23.0", "< 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"

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,14 +22,8 @@ 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
       initialize_commander(options_with_subcommand_class_options)

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/multiarch/remote.rb

@@ -58,4 +58,8 @@ class Kamal::Commands::Builder::Multiarch::Remote < Kamal::Commands::Builder::Mu
     def remove_context(arch)
       docker :context, :rm, builder_name_with_arch(arch)
     end
+
+    def platform_names
+      "linux/#{local_arch},linux/#{remote_arch}"
+    end
 end

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
 
@@ -54,7 +54,6 @@ class Kamal::Configuration
     @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

@@ -166,9 +166,3 @@ healthcheck:
 # Docker logging configuration, see kamal docs logging
 logging:
   ...
-
-# Aliases
-#
-# Alias configuration, see kamal docs alias
-aliases:
-  ...

lib/kamal/configuration/validator.rb

@@ -13,34 +13,32 @@ 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
+      check_unknown_keys! validation_config, example
 
-        validation_config.each do |key, value|
-          next if extension?(key)
-          with_context(key) do
-            example_value = example[key]
+      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)
-              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

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/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.8.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/cli_test_case.rb

@@ -63,12 +63,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

@@ -537,47 +537,9 @@ 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)

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/builder_test.rb

@@ -30,10 +30,10 @@ class CommandsBuilderTest < ActiveSupport::TestCase
   end
 
   test "target multiarch remote when local and remote is set" do
-    builder = new_builder_command(builder: { "local" => {}, "remote" => {}, "cache" => { "type" => "gha" } })
+    builder = new_builder_command(builder: { "local" => { "arch" => "arm64" }, "remote" => { "arch" => "amd64" }, "cache" => { "type" => "gha" } })
     assert_equal "multiarch/remote", builder.name
     assert_equal \
-      "docker buildx build --push --platform linux/amd64,linux/arm64 --builder kamal-app-multiarch-remote -t dhh/app:123 -t dhh/app:latest --cache-to type=gha --cache-from type=gha --label service=\"app\" --file Dockerfile .",
+      "docker buildx build --push --platform linux/arm64,linux/amd64 --builder kamal-app-multiarch-remote -t dhh/app:123 -t dhh/app:latest --cache-to type=gha --cache-from type=gha --label service=\"app\" --file Dockerfile .",
       builder.push.join(" ")
   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/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/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"