Use TART_REGISTRY_HOSTNAME when GitLab provides us registry credenrti…

…als (#29) * Use TART_REGISTRY_HOSTNAME when GitLab provides us registry credenrtials * Also set TART_REGISTRY_HOSTNAME for user-specified env. vars
cirruslabs · Jul 10, 2023 · 4a8d8a4 · 4a8d8a4
1 parent f647c53
commit 4a8d8a4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git 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,
 		}