ostree: replace FetchChecksum with ParentRef on ostree.ImageOptions

The FetchChecksum on ostree.ImageOptions was the resolved commit ID of
the parent ref to be pulled (for ostree commits and containers) or the
commit ID of the content ref (for ostree installers and raw images).
With the new process of manifest creation and serialisation, using the
image options to transport resolved content references is bad and
confusing.  Image options should only reflect user and image type
options before any references are resolved.  With this change, the
ostree.ImageOptions should only reflect the ostree-related options
specified by the user.  Commit IDs will only be available after the
manifest is initialised when the commit sources are resolved (before
serialisation).
This commit is contained in:
Achilleas Koutsou 2023-06-01 13:25:20 +02:00 committed by Ondřej Budai
parent a5e8dfec43
commit d7a5bb99c1
15 changed files with 57 additions and 58 deletions

View file

@ -482,9 +482,9 @@ func generateManifest(ctx context.Context, workers *worker.Server, depsolveJobID
}
options.OSTree = &ostree.ImageOptions{
ImageRef: result.Specs[0].Ref,
FetchChecksum: result.Specs[0].Checksum,
URL: result.Specs[0].URL,
ImageRef: result.Specs[0].Ref,
ParentRef: result.Specs[0].Checksum,
URL: result.Specs[0].URL,
}
}