github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-14 06:55:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #499 from mtrmac/no-docker.Image

Browse Source 
Stop using docker.Image
This commit is contained in:
Miloslav Trmač 2018-08-27 16:00:12 +02:00 committed by GitHub
commit 81837bd55b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/skopeo/inspect.go
View File

@ -96,10 +96,10 @@ var inspectCmd = cli.Command{
return err return err
} }
outputData := inspectOutput{ outputData := inspectOutput{
Name: "", // Possibly overridden for a docker.Image. Name: "", // Set below if DockerReference() is known
Tag: imgInspect.Tag, Tag: imgInspect.Tag,
// Digest is set below. // Digest is set below.
RepoTags: []string{}, // Possibly overriden for a docker.Image. RepoTags: []string{}, // Possibly overriden for docker.Transport.
Created: imgInspect.Created, Created: imgInspect.Created,
DockerVersion: imgInspect.DockerVersion, DockerVersion: imgInspect.DockerVersion,
Labels: imgInspect.Labels, Labels: imgInspect.Labels,
@ -111,9 +111,15 @@ var inspectCmd = cli.Command{
if err != nil { if err != nil {
return fmt.Errorf("Error computing manifest digest: %v", err) return fmt.Errorf("Error computing manifest digest: %v", err)
} }
if dockerImg, ok := img.(*docker.Image); ok { if dockerRef := img.Reference().DockerReference(); dockerRef != nil {
outputData.Name = dockerImg.SourceRefFullName() outputData.Name = dockerRef.Name()
outputData.RepoTags, err = dockerImg.GetRepositoryTags(ctx) }
if img.Reference().Transport() == docker.Transport {
sys, err := contextFromGlobalOptions(c, "")
if err != nil {
return err
}
outputData.RepoTags, err = docker.GetRepositoryTags(ctx, sys, img.Reference())
if err != nil { if err != nil {
// some registries may decide to block the "list all tags" endpoint // some registries may decide to block the "list all tags" endpoint
// gracefully allow the inspect to continue in this case. Currently // gracefully allow the inspect to continue in this case. Currently