Merge pull request #980 from crazy-max/imageid

build: return imageID when loading without docker driver
pull/991/head
Tõnis Tiigi 3 years ago committed by GitHub
commit 8079bd2841
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -766,9 +766,12 @@ func Build(ctx context.Context, drivers []DriverInfo, opt map[string]Options, do
resp[k] = res[0] resp[k] = res[0]
respMu.Unlock() respMu.Unlock()
if len(res) == 1 { if len(res) == 1 {
digest := res[0].ExporterResponse["containerimage.digest"] dgst := res[0].ExporterResponse[exptypes.ExporterImageDigestKey]
if v, ok := res[0].ExporterResponse[exptypes.ExporterImageConfigDigestKey]; ok {
dgst = v
}
if opt.ImageIDFile != "" { if opt.ImageIDFile != "" {
return ioutil.WriteFile(opt.ImageIDFile, []byte(digest), 0644) return ioutil.WriteFile(opt.ImageIDFile, []byte(dgst), 0644)
} }
return nil return nil
} }
@ -778,7 +781,7 @@ func Build(ctx context.Context, drivers []DriverInfo, opt map[string]Options, do
descs := make([]specs.Descriptor, 0, len(res)) descs := make([]specs.Descriptor, 0, len(res))
for _, r := range res { for _, r := range res {
s, ok := r.ExporterResponse["containerimage.digest"] s, ok := r.ExporterResponse[exptypes.ExporterImageDigestKey]
if ok { if ok {
descs = append(descs, specs.Descriptor{ descs = append(descs, specs.Descriptor{
Digest: digest.Digest(s), Digest: digest.Digest(s),

Loading…
Cancel
Save