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.

Sign up for GitHub

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

Jump to bottom

Port to ostree-ext 0.13, cap-std 3 #4794

Merged
merged 1 commit into from
Feb 12, 2024
Merged

Port to ostree-ext 0.13, cap-std 3 #4794

merged 1 commit into from
Feb 12, 2024

Conversation

cgwalters
Copy link
Member

@cgwalters cgwalters commented Jan 24, 2024 •
edited
Loading

  • Soooo much churn around the extension traits
  • A little bit of small ostree-ext porting

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 24, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@cgwalters
Copy link
Member Author

I also want to get containers/containers-image-proxy-rs#63 out so that we can drop the duplicate cap-std versions

@cgwalters
Copy link
Member Author

/test all

@cgwalters
Copy link
Member Author

time="2024-01-24T18:49:01Z" level=fatal msg="Error parsing image name "oci-archive:minimal.ociarchive": creating temp directory: archive file not found: "/__w/rpm-ostree/rpm-ostree/compose-baseimage-test/minimal-test/minimal.ociarchive""

Argh, very likely related to ostreedev/ostree-rs-ext#586 ...will debug this

@cgwalters cgwalters mentioned this pull request Jan 24, 2024
Closed
@cgwalters
Copy link
Member Author

Let's just do #4795 first

@cgwalters cgwalters mentioned this pull request Feb 4, 2024
Closed
@cgwalters
Copy link
Member Author

OK rebased 🏄 and updated to 0.13.1 which should fix the previous bug.

@cgwalters cgwalters marked this pull request as ready for review February 8, 2024 00:35
@cgwalters
Copy link
Member Author

/retest

@cgwalters
Copy link
Member Author

Let's get ostreedev/ostree-rs-ext#603 in then I'll update this, and then it should be good to go.

jmarrero
jmarrero approved these changes Feb 12, 2024
View reviewed changes
Copy link
Member

@jmarrero jmarrero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@cgwalters
Port to ostree-ext 0.13, cap-std 3
9284de4 
- Soooo much churn around the extension traits
- A little bit of small ostree-ext porting
This was referenced Feb 12, 2024
Closed
Closed
Closed
@cgwalters cgwalters enabled auto-merge (rebase) February 12, 2024 22:17
@cgwalters
Copy link
Member Author

I already updated bootc in containers/bootc#334 but multiple tools currently use ostree container image deploy which uses the code from here.

(I do still want to try to slowly convert callers over to bootc install (to-filesystem) too, but that's a distinct thread)

By landing in git main this'll land in our -dev images and be more easily testable.

@cgwalters cgwalters merged commit 53f7e43 into coreos:main Feb 12, 2024
17 checks passed
kdesysadmin pushed a commit to KDE/discover that referenced this pull request Mar 23, 2024
@travier
rpm-ostree: Fix version checks for container path
48adb8f 
Starting with rpm-ostree v2024.3, the version is only set with the
'org.opencontainers.image.version' label and no longer with the
'version' one.

Check the new label first and the old one second to be compatible with
all images.

See:
- https://github.com/coreos/rpm-ostree/releases/tag/v2024.3
- coreos/rpm-ostree#4794
- ostreedev/ostree-rs-ext#581
kdesysadmin pushed a commit to KDE/discover that referenced this pull request Mar 23, 2024
@travier
rpm-ostree: Fix version checks for container path
1af71d2 
Starting with rpm-ostree v2024.3, the version is only set with the
'org.opencontainers.image.version' label and no longer with the
'version' one.

Check the new label first and the old one second to be compatible with
all images.

See:
- https://github.com/coreos/rpm-ostree/releases/tag/v2024.3
- coreos/rpm-ostree#4794
- ostreedev/ostree-rs-ext#581
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmarrero jmarrero jmarrero approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cgwalters @jmarrero @openshift-merge-robot