Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge sylabs/sif through v2.11.6-0.20230615203820-9fe9b624c3fd #32

Closed
wants to merge 4 commits into from

Conversation

edytuk
Copy link
Owner

@edytuk edytuk commented Jul 27, 2023

This pulls in the following PRs, bringing apptainer/sif up to the level of v2.11.6-0.20230615203820-9fe9b624c3fd

  • sylabs/sif# 301
  • sylabs/sif# 306

The original PR descriptions were:

This PR adds 2 new datatypes in supporting sylabs/sif# 188

  • OCI.RootIndex which allows the specification of the OCI image index to be added
  • OCI.Blob which allows the specification of OCI artifacts to be added (blob, configs, manifests, and other indexes)

Make a few changes related to working with OCI blobs:

  • Remove OptOCIBlobMetadata. Calculate the digest automatically when the data is read instead.
  • Rename OCIBlobMetadata to OCIBlobDigest, and have it return a v1.Hash instead of string.
  • Add WithOCIBlobDigest, to easily locate a sif.Descriptor using via GetDescriptor.

wobito and others added 4 commits July 27, 2023 17:43
* add: oci blob support

remove unused string

* add: oci root index support

* update: address pr requests

* add: oci opt test

* add: flag formatting

* update: opts method to handle a reader

Signed-off-by: Edita Kizinevic <edita.kizinevic@cern.ch>
Remove OptOCIBlobMetadata, which required caller to explicitly provide
the digest of an OCI blob when creating a DescriptorInput. Calculate the
digest automatically as the DataOCIRootIndex/DataOCIBlob data is read.

Signed-off-by: Edita Kizinevic <edita.kizinevic@cern.ch>
Return v1.Hash type directly instead of string.

Signed-off-by: Edita Kizinevic <edita.kizinevic@cern.ch>
Signed-off-by: Edita Kizinevic <edita.kizinevic@cern.ch>
@codecov-commenter
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (main@390f62b). Click here to learn what that means.
The diff coverage is n/a.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@           Coverage Diff           @@
##             main      #32   +/-   ##
=======================================
  Coverage        ?   72.89%           
=======================================
  Files           ?       35           
  Lines           ?     2955           
  Branches        ?        0           
=======================================
  Hits            ?     2154           
  Misses          ?      646           
  Partials        ?      155           
Flag Coverage Δ
unittests 72.89% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@edytuk edytuk requested a review from DrDaveD July 27, 2023 16:01
@edytuk edytuk closed this Jul 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants