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

drop the Registry field in output - images are not fully qualified

Browse Source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-01-21 10:31:25 +01:00
parent 6ea444ad5a
commit e1291313aa
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -54,7 +54,6 @@ TODO
- show repo tags via flag or when reference isn't tagged or digested - show repo tags via flag or when reference isn't tagged or digested
- add tests (integration with deployed registries in container - Docker-like) - add tests (integration with deployed registries in container - Docker-like)
- get rid of Docker (meaning make this work w/o needing Docker installed) - get rid of Docker (meaning make this work w/o needing Docker installed)
- drop the `Registry` field in the response because of the point above :)
NOT TODO NOT TODO
- -

4
inspect.go
View File

@ -52,7 +52,6 @@ type imageInspect struct {
Config *containerTypes.Config Config *containerTypes.Config
Architecture string Architecture string
Os string Os string
Registry string
} }
func validateName(name string) error { func validateName(name string) error {
@ -241,7 +240,7 @@ func validateRepoName(name string) error {
return nil return nil
} }
func makeImageInspect(img *image.Image, index, tag string, dgst digest.Digest, tagList []string) *imageInspect { func makeImageInspect(img *image.Image, tag string, dgst digest.Digest, tagList []string) *imageInspect {
var digest string var digest string
if err := dgst.Validate(); err == nil { if err := dgst.Validate(); err == nil {
digest = dgst.String() digest = dgst.String()
@ -258,7 +257,6 @@ func makeImageInspect(img *image.Image, index, tag string, dgst digest.Digest, t
Config: img.Config, Config: img.Config,
Architecture: img.Architecture, Architecture: img.Architecture,
Os: img.OS, Os: img.OS,
Registry: index,
} }
} }

2
inspect_v1.go
View File

@ -145,7 +145,7 @@ func (mf *v1ManifestFetcher) fetchWithSession(ctx context.Context, askedTag stri
return nil, fmt.Errorf("No such image %s:%s", mf.repoInfo.FullName(), askedTag) return nil, fmt.Errorf("No such image %s:%s", mf.repoInfo.FullName(), askedTag)
} }
return makeImageInspect(pulledImg, mf.repoInfo.Index.Name, askedTag, "", tagList), nil return makeImageInspect(pulledImg, askedTag, "", tagList), nil
} }
func (mf *v1ManifestFetcher) pullImageJSON(imgID, endpoint string, token []string) (*image.Image, error) { func (mf *v1ManifestFetcher) pullImageJSON(imgID, endpoint string, token []string) (*image.Image, error) {

2
inspect_v2.go
View File

@ -154,7 +154,7 @@ func (mf *v2ManifestFetcher) fetchWithRepository(ctx context.Context, ref refere
//ref = reference.WithDefaultTag(ref) //ref = reference.WithDefaultTag(ref)
//} //}
//_ = showTags //_ = showTags
return makeImageInspect(image, mf.repoInfo.Index.Name, tag, manifestDigest, tagList), nil return makeImageInspect(image, tag, manifestDigest, tagList), nil
} }
func (mf *v2ManifestFetcher) pullSchema1(ctx context.Context, ref reference.Named, unverifiedManifest *schema1.SignedManifest) (img *image.Image, manifestDigest digest.Digest, err error) { func (mf *v2ManifestFetcher) pullSchema1(ctx context.Context, ref reference.Named, unverifiedManifest *schema1.SignedManifest) (img *image.Image, manifestDigest digest.Digest, err error) {