55a83aff23
[ParseRepositoryInfo] parses an image reference and returns information about the Repository and the registry. As part of this, it validates if the registry's hostname is considered valid using [ValidateIndexName], as well as normalizing the image reference to strip tags and digests using [reference.TrimNamed]. ValidateIndexName only provides very limited value; the only validation happening is to check for the hostname to not start, or end with a hyphen. The cli/command/manifest package used ParseRepositoryInfo in various locations where only the repository name was used (i.e., the result of `reference.TrimNamed` on the given reference), and in one location only used it to validate the registry name. For buildPushRequest, the call was fully redundant, as [RepoNameForReference] was used on the result, calling [newDefaultRepositoryEndpoint], which uses ParseRepositoryInfo internally, so we were only repeating that work. This patch removes uses of ParseRepositoryInfo in those places, and instead calling [reference.TrimNamed] directly. [ParseRepositoryInfo]:41f781fab3/registry/config.go (L375-L381)[ValidateIndexName]:41f781fab3/registry/config.go (L288-L299)[reference.TrimNamed]:41f781fab3/registry/config.go (L369)[RepoNameForReference]:fe0a8d2791/cli/registry/client/endpoint.go (L107-L110)[newDefaultRepositoryEndpoint]:fe0a8d2791/cli/registry/client/endpoint.go (L33-L38)Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
76 lines
2.0 KiB
Go
76 lines
2.0 KiB
Go
package manifest
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/manifest/store"
|
|
"github.com/pkg/errors"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type createOpts struct {
|
|
amend bool
|
|
insecure bool
|
|
}
|
|
|
|
func newCreateListCommand(dockerCli command.Cli) *cobra.Command {
|
|
opts := createOpts{}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "create MANIFEST_LIST MANIFEST [MANIFEST...]",
|
|
Short: "Create a local manifest list for annotating and pushing to a registry",
|
|
Args: cli.RequiresMinArgs(2),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
return createManifestList(cmd.Context(), dockerCli, args, opts)
|
|
},
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
flags.BoolVar(&opts.insecure, "insecure", false, "Allow communication with an insecure registry")
|
|
flags.BoolVarP(&opts.amend, "amend", "a", false, "Amend an existing manifest list")
|
|
return cmd
|
|
}
|
|
|
|
func createManifestList(ctx context.Context, dockerCLI command.Cli, args []string, opts createOpts) error {
|
|
newRef := args[0]
|
|
targetRef, err := normalizeReference(newRef)
|
|
if err != nil {
|
|
return errors.Wrapf(err, "error parsing name for manifest list %s", newRef)
|
|
}
|
|
|
|
manifestStore := dockerCLI.ManifestStore()
|
|
_, err = manifestStore.GetList(targetRef)
|
|
switch {
|
|
case store.IsNotFound(err):
|
|
// New manifest list
|
|
case err != nil:
|
|
return err
|
|
case !opts.amend:
|
|
return errors.Errorf("refusing to amend an existing manifest list with no --amend flag")
|
|
}
|
|
|
|
// Now create the local manifest list transaction by looking up the manifest schemas
|
|
// for the constituent images:
|
|
manifests := args[1:]
|
|
for _, manifestRef := range manifests {
|
|
namedRef, err := normalizeReference(manifestRef)
|
|
if err != nil {
|
|
// TODO: wrap error?
|
|
return err
|
|
}
|
|
|
|
manifest, err := getManifest(ctx, dockerCLI, targetRef, namedRef, opts.insecure)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := manifestStore.Save(targetRef, namedRef, manifest); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
_, _ = fmt.Fprintln(dockerCLI.Out(), "Created manifest list", targetRef.String())
|
|
return nil
|
|
}
|