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

Depend on oci-spec #70

Merged
merged 2 commits into from Oct 26, 2021
Merged

Depend on oci-spec #70

merged 2 commits into from Oct 26, 2021

Conversation

cgwalters
Copy link
Member

Since https://github.com/containers/oci-spec-rs now
exists, let's use it!

@cgwalters
Copy link
Member Author

Ah, oci-spec-rs is depending on https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1540-2021-07-29 from Rust 1.54. Hmm.

@cgwalters
Copy link
Member Author

OK rebased 🏄 and also updated to the new crate version (where the builder pattern is required).

This still only touches the writing paths mostly. So there's more we can do to dedup code...we can get rid of our custom oci::Manifest etc. but that would take over more of the codebase, so I want to land this incremental step first.

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

Looks sane to me!

.build()
.unwrap();
let history = oci_image::HistoryBuilder::default()
.created_by(concat!("created by ", env!("CARGO_PKG_VERSION")))
Copy link
Member

Choose a reason for hiding this comment

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

Not new, though did you mean

Suggested change
.created_by(concat!("created by ", env!("CARGO_PKG_VERSION")))
.created_by(concat!("created by ", env!("CARGO_PKG_NAME"), " v", env!("CARGO_PKG_VERSION")))

here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, thanks!

Spotted in review.
@cgwalters cgwalters merged commit 716c30d into ostreedev:main Oct 26, 2021
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.

None yet

2 participants