From bb8a8d339935d34051013aa2ccbfbe6284e7d4fb Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 15 Jan 2023 12:31:10 +0100 Subject: [PATCH] Singular form --- lib/mrsk/commands/builder/base.rb | 2 +- test/builder_command_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/mrsk/commands/builder/base.rb b/lib/mrsk/commands/builder/base.rb index 56bb5c33..172d434b 100644 --- a/lib/mrsk/commands/builder/base.rb +++ b/lib/mrsk/commands/builder/base.rb @@ -8,7 +8,7 @@ class Mrsk::Commands::Builder::Base < Mrsk::Commands::Base end def build_args - argumentize "--build-args", args + argumentize "--build-arg", args end private diff --git a/test/builder_command_test.rb b/test/builder_command_test.rb index 77fac68d..a9c3082e 100644 --- a/test/builder_command_test.rb +++ b/test/builder_command_test.rb @@ -24,16 +24,16 @@ class BuilderCommandTest < ActiveSupport::TestCase test "build args" do builder = Mrsk::Commands::Builder.new(Mrsk::Configuration.new(@config.merge({ builder: { "args" => { "a" => 1, "b" => 2 } } }))) - assert_equal [ "--build-args", "a=1", "--build-args", "b=2" ], builder.target.build_args + assert_equal [ "--build-arg", "a=1", "--build-arg", "b=2" ], builder.target.build_args end test "native push with build args" do builder = Mrsk::Commands::Builder.new(Mrsk::Configuration.new(@config.merge({ builder: { "multiarch" => false, "args" => { "a" => 1, "b" => 2 } } }))) - assert_equal [ :docker, :build, "-t", "--build-args", "a=1", "--build-args", "b=2", "dhh/app:123", ".", "&&", :docker, :push, "dhh/app:123" ], builder.push + assert_equal [ :docker, :build, "-t", "--build-arg", "a=1", "--build-arg", "b=2", "dhh/app:123", ".", "&&", :docker, :push, "dhh/app:123" ], builder.push end test "multiarch push with build args" do builder = Mrsk::Commands::Builder.new(Mrsk::Configuration.new(@config.merge({ builder: { "args" => { "a" => 1, "b" => 2 } } }))) - assert_equal [ :docker, :buildx, :build, "--push", "--platform linux/amd64,linux/arm64", "-t", "dhh/app:123", "--build-args", "a=1", "--build-args", "b=2", "." ], builder.push + assert_equal [ :docker, :buildx, :build, "--push", "--platform linux/amd64,linux/arm64", "-t", "dhh/app:123", "--build-arg", "a=1", "--build-arg", "b=2", "." ], builder.push end end