From 4a8d8a449197dc852d2db337e96b444aad75c522 Mon Sep 17 00:00:00 2001 From: Nikolay Edigaryev Date: Mon, 10 Jul 2023 18:30:38 +0400 Subject: [PATCH] Use TART_REGISTRY_HOSTNAME when GitLab provides us registry credenrtials (#29) * Use TART_REGISTRY_HOSTNAME when GitLab provides us registry credenrtials * Also set TART_REGISTRY_HOSTNAME for user-specified env. vars --- internal/commands/prepare/prepare.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/commands/prepare/prepare.go b/internal/commands/prepare/prepare.go index e1a6fa1..ebe7233 100644 --- a/internal/commands/prepare/prepare.go +++ b/internal/commands/prepare/prepare.go @@ -144,15 +144,23 @@ func additionalPullEnv(registry *gitlab.Registry) map[string]string { tartRegistryUsername, tartRegistryUsernameOK := os.LookupEnv("CUSTOM_ENV_TART_REGISTRY_USERNAME") tartRegistryPassword, tartRegistryPasswordOK := os.LookupEnv("CUSTOM_ENV_TART_REGISTRY_PASSWORD") if tartRegistryUsernameOK && tartRegistryPasswordOK { - return map[string]string{ + result := map[string]string{ "TART_REGISTRY_USERNAME": tartRegistryUsername, "TART_REGISTRY_PASSWORD": tartRegistryPassword, } + + tartRegistryHostname, tartRegistryHostnameOK := os.LookupEnv("CUSTOM_ENV_TART_REGISTRY_HOSTNAME") + if tartRegistryHostnameOK { + result["TART_REGISTRY_HOSTNAME"] = tartRegistryHostname + } + + return result } // Otherwise fallback to GitLab's provided registry credentials, if any if registry != nil { return map[string]string{ + "TART_REGISTRY_HOSTNAME": registry.Address, "TART_REGISTRY_USERNAME": registry.User, "TART_REGISTRY_PASSWORD": registry.Password, }