diff --git a/lib/kamal/configuration/builder.rb b/lib/kamal/configuration/builder.rb index f863e7f2..3efd62f5 100644 --- a/lib/kamal/configuration/builder.rb +++ b/lib/kamal/configuration/builder.rb @@ -85,10 +85,6 @@ class Kamal::Configuration::Builder builder_config.fetch("driver", "docker-container") end - def pack_arch - builder_config["pack"]["arch"] if pack? - end - def pack_builder builder_config["pack"]["builder"] if pack? end diff --git a/test/commands/builder_test.rb b/test/commands/builder_test.rb index be6686c5..aff8c0c6 100644 --- a/test/commands/builder_test.rb +++ b/test/commands/builder_test.rb @@ -62,8 +62,8 @@ class CommandsBuilderTest < ActiveSupport::TestCase end test "target pack when pack is set" do - builder = new_builder_command(image: "dhh/app", builder: { "pack" => { "arch" => "amd64", "builder" => "heroku/builder:24", "buildpacks" => [ "heroku/ruby", "heroku/procfile" ] } }) - assert_equal "native/pack", builder.name + builder = new_builder_command(image: "dhh/app", builder: { "arch" => "amd64", "pack" => { "builder" => "heroku/builder:24", "buildpacks" => [ "heroku/ruby", "heroku/procfile" ] } }) + assert_equal "pack", builder.name assert_equal \ "pack build dhh/app --platform linux/amd64 --builder heroku/builder:24 --buildpack heroku/ruby --buildpack heroku/procfile --buildpack paketo-buildpacks/image-labels -t dhh/app:123 -t dhh/app:latest --env BP_IMAGE_LABELS=service=app --path . && docker push dhh/app:123 && docker push dhh/app:latest", builder.push.join(" ")