1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5880 from thaJeztah/registry_decouple_trust

Browse Source 
cli/registry/client: remove dependency on trust / notary
This commit is contained in:
Sebastiaan van Stijn 2025-03-03 12:49:54 +01:00 committed by GitHub
commit 43a2fcf5d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/registry/client/client.go
View File

@ -8,7 +8,6 @@ import (
"github.com/distribution/reference" "github.com/distribution/reference"
manifesttypes "github.com/docker/cli/cli/manifest/types" manifesttypes "github.com/docker/cli/cli/manifest/types"
"github.com/docker/cli/cli/trust"
"github.com/docker/distribution" "github.com/docker/distribution"
distributionclient "github.com/docker/distribution/registry/client" distributionclient "github.com/docker/distribution/registry/client"
registrytypes "github.com/docker/docker/api/types/registry" registrytypes "github.com/docker/docker/api/types/registry"
@ -78,7 +77,7 @@ func (c *client) MountBlob(ctx context.Context, sourceRef reference.Canonical, t
if err != nil { if err != nil {
return err return err
} }
repoEndpoint.actions = trust.ActionsPushAndPull repoEndpoint.actions = []string{"pull", "push"}
repo, err := c.getRepositoryForReference(ctx, targetRef, repoEndpoint) repo, err := c.getRepositoryForReference(ctx, targetRef, repoEndpoint)
if err != nil { if err != nil {
return err return err
@ -104,7 +103,7 @@ func (c *client) PutManifest(ctx context.Context, ref reference.Named, manifest
return "", err return "", err
} }
repoEndpoint.actions = trust.ActionsPushAndPull repoEndpoint.actions = []string{"pull", "push"}
repo, err := c.getRepositoryForReference(ctx, ref, repoEndpoint) repo, err := c.getRepositoryForReference(ctx, ref, repoEndpoint)
if err != nil { if err != nil {
return "", err return "", err

3
cli/registry/client/endpoint.go
View File

@ -6,7 +6,6 @@ import (
"time" "time"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/cli/cli/trust"
"github.com/docker/distribution/registry/client/auth" "github.com/docker/distribution/registry/client/auth"
"github.com/docker/distribution/registry/client/transport" "github.com/docker/distribution/registry/client/transport"
registrytypes "github.com/docker/docker/api/types/registry" registrytypes "github.com/docker/docker/api/types/registry"
@ -94,7 +93,7 @@ func getHTTPTransport(authConfig registrytypes.AuthConfig, endpoint registry.API
modifiers = append(modifiers, auth.NewAuthorizer(challengeManager, passThruTokenHandler)) modifiers = append(modifiers, auth.NewAuthorizer(challengeManager, passThruTokenHandler))
} else { } else {
if len(actions) == 0 { if len(actions) == 0 {
actions = trust.ActionsPullOnly actions = []string{"pull"}
} }
creds := registry.NewStaticCredentialStore(&authConfig) creds := registry.NewStaticCredentialStore(&authConfig)
tokenHandler := auth.NewTokenHandler(authTransport, creds, repoName, actions...) tokenHandler := auth.NewTokenHandler(authTransport, creds, repoName, actions...)