use the registry host for the scoped buildx config dir

scopeToConfigDir joined the registry as given onto the Buildx config
dir. For a registry given as a URL this produced
config/https:/<host>/<scope>, and Buildx parses the first path element
as the registry host, so it never finds these credentials.

ECR always hits this: loginECR logs in to the proxy endpoint returned by
GetAuthorizationToken, which is a URL (https://<id>.dkr.ecr.<region>.amazonaws.com),
so a scoped ECR login wrote its credentials to a directory Buildx does
not read, and logout looked in a different directory than login wrote to.

Drop the URL scheme and trailing slashes before building the path.

Assisted-By: Claude
Signed-off-by: breken-ai <312387581+breken-ai@users.noreply.github.com>
This commit is contained in:
breken-ai 2026-09-25 18:50:52 -07:00
parent 783ae9cac5
commit 53ae646628
5 changed files with 54 additions and 7 deletions

View file

@ -3,7 +3,7 @@ import * as path from 'path';
import {Buildx} from '@docker/actions-toolkit/lib/buildx/buildx.js';
import {getAuthList, getInputs} from '../src/context.js';
import {getAuthList, getInputs, scopeToConfigDir} from '../src/context.js';
afterEach(() => {
vi.restoreAllMocks();
@ -168,3 +168,15 @@ test('getAuthList masks registry-auth password when present', async () => {
expect(stdoutWriteSpy.mock.calls.map(call => call[0]).join('')).toContain('::add-mask::groundcontrol');
});
// prettier-ignore
test.each([
['ghcr.io', 'ghcr.io'],
['https://ghcr.io', 'ghcr.io'],
['https://ghcr.io/', 'ghcr.io'],
['http://localhost:5000', 'localhost:5000'],
['https://012345678910.dkr.ecr.eu-west-3.amazonaws.com', '012345678910.dkr.ecr.eu-west-3.amazonaws.com'],
['https://docker.io', 'registry-1.docker.io']
])('scopeToConfigDir uses the registry host for %s', async (registry, host) => {
expect(scopeToConfigDir(registry, 'myorg/myimage@push')).toBe(path.join(Buildx.configDir, 'config', host, 'myorg', 'myimage') + '@push');
});