Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP added implementation for scoped-without-registry support on sync #1100

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

WIP added implementation for scoped-without-registry support on sync #1100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26e69f2
added implementation for scoped-without-registry support on sync
c0ffee Nov 4, 2020
f0dc57e
Merge branch 'master' into scoped-without-registry
c0ffee Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions cmd/skopeo/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@ import (

// syncOptions contains information retrieved from the skopeo sync command line.
type syncOptions struct {
global *globalOptions // Global (not command dependent) skopeo options
srcImage *imageOptions // Source image options
destImage *imageDestOptions // Destination image options
retryOpts *retry.RetryOptions
removeSignatures bool // Do not copy signatures from the source image
signByFingerprint string // Sign the image using a GPG key with the specified fingerprint
source string // Source repository name
destination string // Destination registry name
scoped bool // When true, namespace copied images at destination using the source repository name
all bool // Copy all of the images if an image in the source is a list
global *globalOptions // Global (not command dependent) skopeo options
srcImage *imageOptions // Source image options
destImage *imageDestOptions // Destination image options
retryOpts *retry.RetryOptions
removeSignatures bool // Do not copy signatures from the source image
signByFingerprint string // Sign the image using a GPG key with the specified fingerprint
source string // Source repository name
destination string // Destination registry name
scoped bool // When true, namespace copied images at destination using the source repository name
all bool // Copy all of the images if an image in the source is a list
scopedWithoutRegistry bool // When true, like scoped but without the registry prefix
}

// repoDescriptor contains information of a single repository used as a sync source.
Expand Down Expand Up @@ -98,6 +99,7 @@ See skopeo-sync(1) for details.
flags.StringVarP(&opts.source, "src", "s", "", "SOURCE transport type")
flags.StringVarP(&opts.destination, "dest", "d", "", "DESTINATION transport type")
flags.BoolVar(&opts.scoped, "scoped", false, "Images at DESTINATION are prefix using the full source image path as scope")
flags.BoolVar(&opts.scopedWithoutRegistry, "scoped-without-registry", false, "Images at DESTINATION are prefix using the full source image path as scope but without the registry")
flags.BoolVarP(&opts.all, "all", "a", false, "Copy all images if SOURCE-IMAGE is a list")
flags.AddFlagSet(&sharedFlags)
flags.AddFlagSet(&srcFlags)
Expand Down Expand Up @@ -572,6 +574,13 @@ func (opts *syncOptions) run(args []string, stdout io.Writer) error {
case docker.Transport:
// docker -> dir or docker -> docker
destSuffix = ref.DockerReference().String()
if opts.scopedWithoutRegistry {
removeRegistry := func(s string) string {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for the anonymous function.

split := strings.Split(s, "/")
return strings.Join(split[1:], "/")
}
destSuffix = removeRegistry(ref.DockerReference().String())
}
case directory.Transport:
// dir -> docker (we don't allow `dir` -> `dir` sync operations)
destSuffix = strings.TrimPrefix(ref.StringWithinTransport(), srcRepo.DirBasePath)
Expand All @@ -581,7 +590,7 @@ func (opts *syncOptions) run(args []string, stdout io.Writer) error {
}
}

if !opts.scoped {
if !opts.scoped && !opts.scopedWithoutRegistry {
destSuffix = path.Base(destSuffix)
}

Expand Down