fix: erase the docker hub credential on registry:logout

Docker stores Docker Hub under the index server address rather than the hostname the user logged in with, and `docker logout` only erases the exact key it is given, so `registry:logout docker.io` reported success while leaving the credential in place. The server is now resolved to the key docker actually stores before the logout runs.
This commit is contained in:
Jose Diaz-Gonzalez committed 2026-09-19 18:56:46 -04:00
1 parent a4f791b85d
commit 2e3d144aca
5 files changed
+145 -6

No files matched your search

+48
View File
@@ -15,6 +15,9 @@ import (
const registryConfigDir = "/var/lib/dokku/config/registry"
// dockerIndexServer is the auths key docker stores Docker Hub credentials under
const dockerIndexServer = "https://index.docker.io/v1/"
// GetAppRegistryConfigDir returns the per-app registry config directory
func GetAppRegistryConfigDir(appName string) string {
return filepath.Join(registryConfigDir, appName)
@@ -30,9 +33,19 @@ func GetComputedAppRegistryConfigDir(appName string) string {
return GetAppRegistryConfigDir(appName)
}
return GetGlobalRegistryConfigDir()
}
// GetGlobalRegistryConfigDir returns the docker config directory global logins write to
func GetGlobalRegistryConfigDir() string {
return filepath.Join(os.Getenv("DOKKU_ROOT"), ".docker")
}
// GetGlobalRegistryConfigPath returns the path to the global docker config.json
func GetGlobalRegistryConfigPath() string {
return filepath.Join(GetGlobalRegistryConfigDir(), "config.json")
}
// HasAppRegistryAuth checks if an app has registry credentials configured
func HasAppRegistryAuth(appName string) bool {
configPath := GetAppRegistryConfigPath(appName)
@@ -245,3 +258,38 @@ func imageCleanup(appName string, imageRepo string, imageTag string, tag int) {
imagesToRemove = append(imagesToRemove, imageIDs...)
common.RemoveImages(imagesToRemove)
}
// normalizeRegistryServer applies the dokku-level aliases for a registry server
func normalizeRegistryServer(server string) string {
if server == "hub.docker.com" || server == "docker.com" {
return "docker.io"
}
return server
}
// convertToHostname strips any scheme and path from a registry server, matching
// the rule docker applies before storing or looking up a credential
func convertToHostname(server string) string {
stripped := server
if strings.HasPrefix(stripped, "http://") {
stripped = strings.TrimPrefix(stripped, "http://")
} else if strings.HasPrefix(stripped, "https://") {
stripped = strings.TrimPrefix(stripped, "https://")
}
return strings.SplitN(stripped, "/", 2)[0]
}
// dockerAuthKey returns the key docker uses for a registry server in the auths
// map of a config.json. Docker Hub is stored under the index server address
// rather than the hostname the user logged in with, and is also the only server
// docker treats that way: registry-1.docker.io gets a key of its own.
func dockerAuthKey(server string) string {
hostname := convertToHostname(normalizeRegistryServer(server))
if hostname == "" || hostname == "docker.io" || hostname == "index.docker.io" {
return dockerIndexServer
}
return hostname
}