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

Updated oci-spec-rs to 0.5.1 or later #303

Merged
merged 13 commits into from
Sep 27, 2021
Merged

Updated oci-spec-rs to 0.5.1 or later #303

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
936c6ea
Updated cgroup oci-spec-rs to 0.5.1
guni1192 Sep 18, 2021
a1e5904
Adapted cgroup crate test code to builder pattern
guni1192 Sep 19, 2021
4bc7c9b
Adapted cgroup v2 devices test code to builder pattern
guni1192 Sep 19, 2021
3f6dade
fix clippy
guni1192 Sep 19, 2021
6220478
Upgrade oci-spec-rs to 0.5.1 later in youki
guni1192 Sep 23, 2021
3fb96d8
Fix clippy
guni1192 Sep 24, 2021
0d2e38f
Merge remote-tracking branch 'upstream/main' into oci-spec-rs-0.5.1
guni1192 Sep 25, 2021
830a427
Apply some test code to the builder pattern
guni1192 Sep 25, 2021
215d900
resolve conflict
guni1192 Sep 25, 2021
b0be621
fix clippy warnings
guni1192 Sep 25, 2021
234f490
cgroup: fix Memory apply() to pass unit test
guni1192 Sep 25, 2021
ac2053e
Merge remote-tracking branch 'upstream/main' into oci-spec-rs-0.5.1
guni1192 Sep 25, 2021
30459f4
Rename variable name cb -> capabilities_builder
guni1192 Sep 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
97 changes: 94 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ mio = { version = "0.7.13", features = ["os-ext", "os-poll"] }
chrono = { version="0.4", features = ["serde"] }
once_cell = "1.6.0"
futures = { version = "0.3", features = ["thread-pool"] }
oci-spec = { git="https://github.com/utam0k/oci-spec-rs/", tag = "v0.4.0-with-bugfix"}
# TODO: Fetch from crate.io instead of git when next release oci-spec-rs
yihuaf marked this conversation as resolved.
Show resolved Hide resolved
# ref: https://github.com/containers/oci-spec-rs/pull/69
# oci-spec = "0.5.1"
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "5018f8e5b0355a82c08962cefa5ab07a05b930c6" }
cgroups = { version = "0.1.0", path = "./cgroups" }
systemd = { version = "0.8", default-features = false, optional = true }
dbus = "0.9.2"
Expand All @@ -49,7 +52,10 @@ crossbeam-channel = "0.5"
seccomp = { version = "0.1.0", path = "./seccomp" }

[dev-dependencies]
oci-spec = { git = "https://github.com/utam0k/oci-spec-rs/", tag = "v0.4.0-with-bugfix", features = ["proptests"] }
# TODO: Fetch from crate.io instead of git when next release oci-spec-rs
# ref: https://github.com/containers/oci-spec-rs/pull/69
# oci-spec = "0.5.1"
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "5018f8e5b0355a82c08962cefa5ab07a05b930c6", features = ["proptests"] }
quickcheck = "1"
serial_test = "0.5.1"

Expand Down
10 changes: 8 additions & 2 deletions cgroups/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ nix = "0.22.0"
procfs = "0.10.1"
log = "0.4"
anyhow = "1.0"
oci-spec = { git="https://github.com/utam0k/oci-spec-rs/", tag = "v0.4.0-with-bugfix"}
# TODO: Fetch from crate.io instead of git when next release oci-spec-rs
# ref: https://github.com/containers/oci-spec-rs/pull/69
# oci-spec = "0.5.1"
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "5018f8e5b0355a82c08962cefa5ab07a05b930c6" }
yihuaf marked this conversation as resolved.
Show resolved Hide resolved
systemd = { version = "0.8", default-features = false, optional = true }
dbus = "0.9.2"
serde = { version = "1.0", features = ["derive"] }
Expand All @@ -24,7 +27,10 @@ errno = { version = "0.2.7", optional = true }
libc = { version = "0.2.84", optional = true }

[dev-dependencies]
oci-spec = { git = "https://github.com/utam0k/oci-spec-rs/", tag = "v0.4.0-with-bugfix", features = ["proptests"] }
# TODO: Fetch from crate.io instead of git when next release oci-spec-rs
# ref: https://github.com/containers/oci-spec-rs/pull/69
# oci-spec = "0.5.1"
oci-spec = { git = "https://github.com/containers/oci-spec-rs", rev = "5018f8e5b0355a82c08962cefa5ab07a05b930c6", features = ["proptests"] }
quickcheck = "1"
clap = "2"
serde = { version = "1.0", features = ["derive"] }
Expand Down