github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-14 12:46:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge efbac9934d into a7a0fc47b6

Browse Source
This commit is contained in:
Jonas 2025-08-04 21:08:22 +02:00 committed by GitHub
commit d0623dd619
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/skopeo/sync.go
View File

@ -166,7 +166,7 @@ func parseRepositoryReference(input string) (reference.Named, error) {
// destinationReference creates an image reference using the provided transport. // destinationReference creates an image reference using the provided transport.
// It returns a image reference to be used as destination of an image copy and // It returns a image reference to be used as destination of an image copy and
// any error encountered. // any error encountered.
func destinationReference(destination string, transport string) (types.ImageReference, error) { func destinationReference(destination string, transport string, dryRun bool) (types.ImageReference, error) {
var imageTransport types.ImageTransport var imageTransport types.ImageTransport
switch transport { switch transport {
@ -181,9 +181,11 @@ func destinationReference(destination string, transport string) (types.ImageRefe
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
return nil, fmt.Errorf("Destination directory could not be used: %w", err) return nil, fmt.Errorf("Destination directory could not be used: %w", err)
} }
// the directory holding the image must be created here if !dryRun {
if err = os.MkdirAll(destination, 0755); err != nil { // the directory holding the image must be created here
return nil, fmt.Errorf("Error creating directory for image %s: %w", destination, err) if err = os.MkdirAll(destination, 0755); err != nil {
return nil, fmt.Errorf("Error creating directory for image %s: %w", destination, err)
}
} }
imageTransport = directory.Transport imageTransport = directory.Transport
default: default:
@ -697,7 +699,7 @@ func (opts *syncOptions) run(args []string, stdout io.Writer) (retErr error) {
destSuffix = path.Base(destSuffix) destSuffix = path.Base(destSuffix)
} }
destRef, err := destinationReference(path.Join(destination, destSuffix)+opts.appendSuffix, opts.destination) destRef, err := destinationReference(path.Join(destination, destSuffix)+opts.appendSuffix, opts.destination, opts.dryRun)
if err != nil { if err != nil {
return err return err
} }

25
integration/sync_test.go
View File

@ -266,6 +266,31 @@ func (s *syncSuite) TestDocker2DirUntagged() {
assert.Len(t, nManifests, len(tags)) assert.Len(t, nManifests, len(tags))
} }
func (s *syncSuite) TestDocker2DirDryRun() {
t := s.T()
tmpDir := t.TempDir()
// FIXME: It would be nice to use one of the local Docker registries instead of needing an Internet connection.
image := pullableRepo
imageRef, err := docker.ParseReference(fmt.Sprintf("//%s", image))
require.NoError(t, err)
require.NoError(t, err)
assertSkopeoSucceeds(t, "", "sync", "--scoped", "--dry-run", "--src", "docker", "--dest", "dir", image, tmpDir)
sysCtx := types.SystemContext{}
tags, err := docker.GetRepositoryTags(context.Background(), &sysCtx, imageRef)
require.NoError(t, err)
assert.NotZero(t, len(tags))
d, err := os.Open(tmpDir)
require.NoError(t, err)
defer d.Close()
nDirEntries, err := d.ReadDir(1)
require.NoError(t, err)
assert.Equal(t, 0, len(nDirEntries))
}
func (s *syncSuite) TestYamlUntagged() { func (s *syncSuite) TestYamlUntagged() {
t := s.T() t := s.T()
tmpDir := t.TempDir() tmpDir := t.TempDir()