From c4e44d40d1a931847c7fb15eed591e8d8596774e Mon Sep 17 00:00:00 2001
From: Joshua Sierles <joshua@fly.io>
Date: Tue, 17 Sep 2024 18:17:32 +0200
Subject: [PATCH] Obey alternate registry settings for Docker auth (#3947)

---
 internal/build/imgsrc/docker.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/internal/build/imgsrc/docker.go b/internal/build/imgsrc/docker.go
index 63178a0cd8..e9e4f620c8 100644
--- a/internal/build/imgsrc/docker.go
+++ b/internal/build/imgsrc/docker.go
@@ -636,17 +636,20 @@ func clearDeploymentTags(ctx context.Context, docker *dockerclient.Client, tag s
 }
 
 func registryAuth(token string) registry.AuthConfig {
+	targetRegistry := viper.GetString(flyctl.ConfigRegistryHost)
 	return registry.AuthConfig{
 		Username:      "x",
 		Password:      token,
-		ServerAddress: "registry.fly.io",
+		ServerAddress: targetRegistry,
 	}
 }
 
 func authConfigs(token string) map[string]registry.AuthConfig {
+	targetRegistry := viper.GetString(flyctl.ConfigRegistryHost)
+
 	authConfigs := map[string]registry.AuthConfig{}
 
-	authConfigs["registry.fly.io"] = registryAuth(token)
+	authConfigs[targetRegistry] = registryAuth(token)
 
 	dockerhubUsername := os.Getenv("DOCKER_HUB_USERNAME")
 	dockerhubPassword := os.Getenv("DOCKER_HUB_PASSWORD")