Skip to content

Commit dab9674

Browse files
committed
Revert "login: normalize registry-1.docker.io"
This reverts commit e662467. Since e662467, during login, we started normalizing `registry-1.docker.io` to `index.docker.io`. This means that if a user logs in with `docker login -u [username] registry-1.docker.io`, the user's credentials get stored in credhelpers/config.json under `https://index.docker.io/v1/`. However, while the registry code normalizes an image reference without registry (`docker pull alpine:latest`) and image references explicitly for `index.docker.io` (`docker pull index.docker.io/library/alpine:latest`) to the official index server (`https://index.docker.io/v1/`), and fetches credentials for that auth key, it does not normalize `registry-1.docker.io`, which means pulling explicitly from there (`docker pull registry-1.docker.io/alpine:latest`) will not use credentials stored under `https://index.docker.io/v1/`. As such, until changes are made to the registry/pull/push code to normalize `registry-1.docker.io` to `https://index.docker.io/v1/`, we should not normalize this during login. Signed-off-by: Laura Brehm <laurabrehm@hey.com>
1 parent 3826f5a commit dab9674

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

cli/command/registry/login.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,7 @@ func runLogin(ctx context.Context, dockerCli command.Cli, opts loginOptions) err
9090
serverAddress string
9191
response *registrytypes.AuthenticateOKBody
9292
)
93-
if opts.serverAddress != "" &&
94-
opts.serverAddress != registry.DefaultNamespace &&
95-
opts.serverAddress != registry.DefaultRegistryHost {
93+
if opts.serverAddress != "" && opts.serverAddress != registry.DefaultNamespace {
9694
serverAddress = opts.serverAddress
9795
} else {
9896
serverAddress = registry.IndexServer

0 commit comments

Comments
 (0)