From 4b46449fdf420a0c4a3274ed211747033cb61876 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 8 Jan 2023 14:07:29 +0100 Subject: [PATCH] Split out repository to be used alone --- lib/mrsk/configuration.rb | 6 +++++- test/configuration_test.rb | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/mrsk/configuration.rb b/lib/mrsk/configuration.rb index 318c6e6f..dd85103d 100644 --- a/lib/mrsk/configuration.rb +++ b/lib/mrsk/configuration.rb @@ -25,8 +25,12 @@ class Mrsk::Configuration @version ||= ENV["VERSION"] || `git rev-parse HEAD`.strip end + def repository + [ config.registry["server"], image ].compact.join("/") + end + def absolute_image - [ config.registry["server"], "#{image}:#{version}" ].compact.join("/") + "#{repository}:#{version}" end def service_with_version diff --git a/test/configuration_test.rb b/test/configuration_test.rb index ac6f2f99..b8689b99 100644 --- a/test/configuration_test.rb +++ b/test/configuration_test.rb @@ -19,6 +19,14 @@ class ConfigurationTest < ActiveSupport::TestCase end end + test "repository" do + configuration = Mrsk::Configuration.new(@config) + assert_equal "dhh/app", configuration.repository + + configuration = Mrsk::Configuration.new(@config.tap { |c| c[:registry].merge!({ "server" => "ghcr.io" }) }) + assert_equal "ghcr.io/dhh/app", configuration.repository + end + test "absolute image" do configuration = Mrsk::Configuration.new(@config) assert_equal "dhh/app:123", configuration.absolute_image