Skip to content

Commit

Permalink
Bump oci-spec to 0.7.0 (#2934)
Browse files Browse the repository at this point in the history
* Bump oci-spec from 0.6.8 to 0.7.0

Bumps [oci-spec](https://github.com/containers/oci-spec-rs) from 0.6.8 to 0.7.0.
- [Release notes](https://github.com/containers/oci-spec-rs/releases)
- [Changelog](https://github.com/containers/oci-spec-rs/blob/main/release.md)
- [Commits](containers/oci-spec-rs@v0.6.8...v0.7.0)

---
updated-dependencies:
- dependency-name: oci-spec
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump oci-spec to 0.7.0
Signed-off-by: kiokuless <110003596+kiokuless@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
kiokuless and dependabot[bot] authored Sep 27, 2024
1 parent 2afe665 commit e0d53a8
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
5 changes: 2 additions & 3 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions crates/libcgroups/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cgroupsv2_devices = ["rbpf", "libbpf-sys", "errno", "libc", "nix/dir"]
[dependencies]
nix = { version = "0.28.0", features = ["signal", "user", "fs"] }
procfs = "0.16.0"
oci-spec = { version = "~0.6.8", features = ["runtime"] }
oci-spec = { version = "~0.7.0", features = ["runtime"] }
fixedbitset = "0.5.7"
serde = { version = "1.0", features = ["derive"] }
rbpf = { version = "0.3.0", optional = true }
Expand All @@ -34,7 +34,7 @@ tracing = { version = "0.1.40", features = ["attributes"] }

[dev-dependencies]
anyhow = "1.0"
oci-spec = { version = "~0.6.8", features = ["proptests", "runtime"] }
oci-spec = { version = "~0.7.0", features = ["proptests", "runtime"] }
quickcheck = "1"
mockall = { version = "0.13.0", features = [] }
clap = "4.1.6"
Expand Down
4 changes: 2 additions & 2 deletions crates/libcontainer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ nix = { version = "0.28.0", features = [
"term",
"hostname",
] }
oci-spec = { version = "0.6.8", features = ["runtime"] }
oci-spec = { version = "0.7.0", features = ["runtime"] }
once_cell = "1.19.0"
procfs = "0.16.0"
prctl = "1.0.0"
Expand All @@ -53,7 +53,7 @@ safe-path = "0.1.0"
nc = "0.9.3"

[dev-dependencies]
oci-spec = { version = "~0.6.8", features = ["proptests", "runtime"] }
oci-spec = { version = "~0.7.0", features = ["proptests", "runtime"] }
quickcheck = "1"
serial_test = "3.1.1"
tempfile = "3"
Expand Down
2 changes: 2 additions & 0 deletions crates/libcontainer/src/seccomp/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ fn translate_arch(arch: Arch) -> ScmpArch {
Arch::ScmpArchPpc64le => ScmpArch::Ppc64Le,
Arch::ScmpArchS390 => ScmpArch::S390,
Arch::ScmpArchS390x => ScmpArch::S390X,
Arch::ScmpArchRiscv64 => ScmpArch::Riscv64,
}
}

Expand All @@ -89,6 +90,7 @@ fn translate_action(action: LinuxSeccompAction, errno: Option<u32>) -> Result<Sc
LinuxSeccompAction::ScmpActKillProcess => ScmpAction::KillProcess,
LinuxSeccompAction::ScmpActNotify => ScmpAction::Notify,
LinuxSeccompAction::ScmpActLog => ScmpAction::Log,
LinuxSeccompAction::ScmpActKillThread => ScmpAction::KillThread,
};

tracing::trace!(?action, "translated action");
Expand Down
2 changes: 1 addition & 1 deletion tests/contest/contest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ libcgroups = { path = "../../../crates/libcgroups" }
libcontainer = { path = "../../../crates/libcontainer" }
nix = "0.28.0"
num_cpus = "1.16"
oci-spec = { version = "0.6.4", features = ["runtime"] }
oci-spec = { version = "0.7.0", features = ["runtime"] }
once_cell = "1.19.0"
pnet_datalink = "0.35.0"
procfs = "0.16.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/contest/runtimetest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "0.0.1"
edition = "2021"

[dependencies]
oci-spec = { version = "0.6.8", features = ["runtime"] }
oci-spec = { version = "0.7.0", features = ["runtime"] }
nix = "0.28.0"
anyhow = "1.0"
libc = "0.2.159" # TODO (YJDoc2) upgrade to latest
Expand Down

0 comments on commit e0d53a8

Please sign in to comment.