remove todo - image be fully qualified

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-01-21 10:29:02 +01:00
parent b81f3f8c41
commit 6ea444ad5a
3 changed files with 8 additions and 18 deletions

View File

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

View File

@ -76,26 +76,10 @@ func inspect(c *cli.Context) (*imageInspect, error) {
if err != nil {
return nil, err
}
// TODO(runcom)
//var showTags bool
//if reference.IsNameOnly(ref) {
//showTags = true
//logrus.Debug("Using default tag: latest")
//ref = reference.WithDefaultTag(ref)
//}
//_ = showTags
authConfig, err := getAuthConfig(c, ref)
if err != nil {
return nil, err
}
// TODO(runcom): remove docker.io case cause unqualified images
// can be from additional registry below
// tweak the ParseNamed above so I can know if its unqualified
// EDIT(runcom): it's probably better to expose an additional registries REST
// route in projectatomic fork of docker and let the magic happen in projectatomic/docker
//if ref.Hostname() != "" {
//}
imgInspect, err := getData(ref, authConfig)
if err != nil {
return nil, err
@ -111,7 +95,6 @@ func getData(ref reference.Named, authConfig types.AuthConfig) (*imageInspect, e
if err := validateRepoName(repoInfo.Name()); err != nil {
return nil, err
}
// FATA[0000] open /etc/docker/certs.d/myreg.com:4000: permission denied
// need to be run as root, really? :(
// just pass tlsconfig via cli?!?!?!

View File

@ -146,6 +146,14 @@ func (mf *v2ManifestFetcher) fetchWithRepository(ctx context.Context, ref refere
return nil, errors.New("unsupported manifest format")
}
// TODO(runcom)
//var showTags bool
//if reference.IsNameOnly(ref) {
//showTags = true
//logrus.Debug("Using default tag: latest")
//ref = reference.WithDefaultTag(ref)
//}
//_ = showTags
return makeImageInspect(image, mf.repoInfo.Index.Name, tag, manifestDigest, tagList), nil
}