Skip to content

Commit

Permalink
add tags from load image
Browse files Browse the repository at this point in the history
Signed-off-by: ilya-korotya <officalbatya@gmail.com>
  • Loading branch information
ilya-korotya committed May 7, 2020
1 parent fd784ce commit 1e3cffb
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions image/tarexport/save.go
Expand Up @@ -58,7 +58,7 @@ func (l *tarexporter) parseNames(names []string) (desc map[image.ID]*imageDescri
}
}()

addAssoc := func(id image.ID, ref reference.Named) error {
addAssoc := func(id image.ID, refs []reference.Named) error {
if _, ok := imgDescr[id]; !ok {
descr := &imageDescriptor{}
if err := l.takeLayerReference(id, descr); err != nil {
Expand All @@ -67,13 +67,13 @@ func (l *tarexporter) parseNames(names []string) (desc map[image.ID]*imageDescri
imgDescr[id] = descr
}

if ref != nil {
for _, ref := range refs {
if _, ok := ref.(reference.Canonical); ok {
return nil
continue
}
tagged, ok := reference.TagNameOnly(ref).(reference.NamedTagged)
if !ok {
return nil
continue
}

for _, t := range imgDescr[id].refs {
Expand Down Expand Up @@ -117,7 +117,7 @@ func (l *tarexporter) parseNames(names []string) (desc map[image.ID]*imageDescri
if reference.IsNameOnly(namedRef) {
assocs := l.rs.ReferencesByName(namedRef)
for _, assoc := range assocs {
if err := addAssoc(image.IDFromDigest(assoc.ID), assoc.Ref); err != nil {
if err := addAssoc(image.IDFromDigest(assoc.ID), []reference.Named{assoc.Ref}); err != nil {
return nil, err
}
}
Expand All @@ -126,7 +126,8 @@ func (l *tarexporter) parseNames(names []string) (desc map[image.ID]*imageDescri
if err != nil {
return nil, err
}
if err := addAssoc(imgID, nil); err != nil {
refs := l.rs.References(imgID.Digest())
if err := addAssoc(imgID, refs); err != nil {
return nil, err
}
}
Expand All @@ -136,7 +137,7 @@ func (l *tarexporter) parseNames(names []string) (desc map[image.ID]*imageDescri
if err != nil {
return nil, err
}
if err := addAssoc(image.IDFromDigest(id), namedRef); err != nil {
if err := addAssoc(image.IDFromDigest(id), []reference.Named{namedRef}); err != nil {
return nil, err
}

Expand Down

0 comments on commit 1e3cffb

Please sign in to comment.