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

Update vendor of containers/storage #2052

Merged
merged 1 commit into from
Jul 21, 2023
Merged

Update vendor of containers/storage #2052

merged 1 commit into from
Jul 21, 2023

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jul 21, 2023

No description provided.

@rhatdan
Copy link
Member Author

rhatdan commented Jul 21, 2023

@mtrmac not sure what is breaking here?

go.mod Outdated
@@ -7,7 +7,7 @@ require (
github.com/BurntSushi/toml v1.3.2
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01
github.com/containers/ocicrypt v1.1.7
github.com/containers/storage v1.48.0
github.com/containers/storage 4a3a3019d7659029f50c913c40e0bd94fc9ba284
Copy link
Contributor

@flouthoc flouthoc Jul 21, 2023

Choose a reason for hiding this comment

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

I think this should be version as listed below and maybe followed by go mod tidy

Suggested change
github.com/containers/storage 4a3a3019d7659029f50c913c40e0bd94fc9ba284
github.com/containers/storage v1.48.1-0.20230721123825-4a3a3019d765

@rhatdan
Copy link
Member Author

rhatdan commented Jul 21, 2023

FIxed

@mtrmac
Copy link
Collaborator

mtrmac commented Jul 21, 2023

Is there a specific reason to update, on the main brach, to an unreleased version?

To be clear, I’m not at all saying that this is undesirable, I’m just curious what is the context is. Are some new users of the new features coming?

@rhatdan
Copy link
Member Author

rhatdan commented Jul 21, 2023

I am trying to roll everything forward, in order to get continuous testing and updates via renovate,

@rhatdan
Copy link
Member Author

rhatdan commented Jul 21, 2023

There seems to be something that is locking Podman to the released version of containers/image and make vendor keeps pushing it back.

@mtrmac mtrmac merged commit 68b102d into containers:main Jul 21, 2023
@mtrmac
Copy link
Collaborator

mtrmac commented Jul 21, 2023

There seems to be something that is locking Podman to the released version of containers/image and make vendor keeps pushing it back.

That’s because the last released version of c/image is on a branch. The fix for that is, IIRC:

  • In c/image, merge the release-5.26 branch into main (so that main is visible in Git as a successor to the last released version)
  • In a consumer, update c/image at least to that merge point.

See #1842 and containers/skopeo#1911 .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants