diff --git a/lib/mrsk/configuration.rb b/lib/mrsk/configuration.rb index 18be37fb..24dc3d53 100644 --- a/lib/mrsk/configuration.rb +++ b/lib/mrsk/configuration.rb @@ -25,7 +25,7 @@ class Mrsk::Configuration end def absolute_image - [ config.registry["server"], image ].compact.join("/") + [ config.registry["server"], image_with_version ].compact.join("/") end def image_with_version diff --git a/test/configuration_test.rb b/test/configuration_test.rb index 7a5c4162..3b2284f9 100644 --- a/test/configuration_test.rb +++ b/test/configuration_test.rb @@ -1,6 +1,8 @@ require "test_helper" require "mrsk/configuration" +ENV["VERSION"] = "123" + class ConfigurationTest < ActiveSupport::TestCase setup do @config = { service: "app", image: "dhh/app", registry: { "username" => "dhh", "password" => "secret" } } @@ -8,9 +10,9 @@ class ConfigurationTest < ActiveSupport::TestCase test "absolute image" do configuration = Mrsk::Configuration.new(@config) - assert_equal "dhh/app", configuration.absolute_image + assert_equal "dhh/app:123", configuration.absolute_image configuration = Mrsk::Configuration.new(@config.tap { |c| c[:registry].merge!({ "server" => "ghcr.io" }) }) - assert_equal "ghcr.io/dhh/app", configuration.absolute_image + assert_equal "ghcr.io/dhh/app:123", configuration.absolute_image end end