docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 17:37:46 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1441 from crazy-max/fix-nil-ref

Browse Source 
imagetools: set default repo ref on creation if nil
This commit is contained in:
Tõnis Tiigi 2022-12-01 09:51:09 -05:00 committed by GitHub
commit e91d5326fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
commands/imagetools/create.go
View File

@ -90,21 +90,24 @@ func runCreate(dockerCli command.Cli, in createOptions, args []string) error {
} }
for i, s := range srcs { for i, s := range srcs {
if s.Ref == nil && s.Desc.MediaType == "" && s.Desc.Digest != "" { if s.Ref == nil {
if defaultRepo == nil { if defaultRepo == nil {
return errors.Errorf("multiple repositories specified, cannot infer repository for %q", args[i]) return errors.Errorf("multiple repositories specified, cannot infer repository for %q", args[i])
} }
n, err := reference.ParseNormalizedNamed(*defaultRepo) n, err := reference.ParseNormalizedNamed(*defaultRepo)
if err != nil { if err != nil {
return err return err
} }
r, err := reference.WithDigest(n, s.Desc.Digest) if s.Desc.MediaType == "" && s.Desc.Digest != "" {
if err != nil { r, err := reference.WithDigest(n, s.Desc.Digest)
return err if err != nil {
return err
}
srcs[i].Ref = r
sourceRefs = true
} else {
srcs[i].Ref = reference.TagNameOnly(n)
} }
srcs[i].Ref = r
sourceRefs = true
} }
} }