Skip to content

Commit

Permalink
Add minimum rust version requirement to libcgroups and libcontainers …
Browse files Browse the repository at this point in the history
…due to CVE-2022-21658
  • Loading branch information
YJDoc2 committed Jan 21, 2022
1 parent f5e5aeb commit a840866
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests_validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [1.56.1, 1.58.0]
rust: [1.58.1]
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [1.56.1, 1.58.0]
rust: [1.58.1]
dirs: ${{ fromJSON(needs.changes.outputs.dirs) }}
steps:
- uses: actions/checkout@v2
Expand All @@ -52,7 +52,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [1.56.1, 1.58.0]
rust: [1.58.1]
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [1.56.1, 1.58.0]
rust: [1.58.1]
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -116,6 +116,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.rust }}
override: true
- name: Cache youki
uses: Swatinem/rust-cache@v1
- run: sudo apt-get -y update
Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@


[workspace]
members = [
"crates/*"
Expand Down
3 changes: 2 additions & 1 deletion crates/libcgroups/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "libcgroups"
version = "0.0.1"
version = "0.0.2"
edition = "2021"
rust-version = "1.58.1"
autoexamples = false

[features]
Expand Down
7 changes: 4 additions & 3 deletions crates/libcontainer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[package]
name = "libcontainer"
version = "0.0.1"
version = "0.0.2"
authors = ["youki team"]
edition = "2021"
rust-version = "1.58.1"
description = "Library for container creation"

[dependencies]
Expand All @@ -22,8 +23,8 @@ oci-spec = "0.5.3"
path-clean = "0.1.0"
procfs = "0.12.0"
prctl = "1.0.0"
libcgroups = { version = "0.0.1", path = "../libcgroups" }
libseccomp = { version = "0.0.1", path = "../libseccomp" }
libcgroups = { version = "0.0.2", path = "../libcgroups" }
libseccomp = { version = "0.0.2", path = "../libseccomp" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

Expand Down
2 changes: 1 addition & 1 deletion crates/liboci-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "liboci-cli"
version = "0.0.1"
version = "0.0.2"
authors = ["youki team"]
edition = "2021"
description = "Parse command line arguments for OCI container runtimes"
Expand Down
2 changes: 1 addition & 1 deletion crates/libseccomp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "libseccomp"
version = "0.0.1"
version = "0.0.2"
edition = "2021"

build = "build.rs"
Expand Down
8 changes: 4 additions & 4 deletions crates/youki/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "youki"
version = "0.0.1"
version = "0.0.2"
authors = ["youki team"]
edition = "2021"
description = "A container runtime written in Rust"
Expand All @@ -15,9 +15,9 @@ features = ["std", "suggestions", "derive", "cargo"]
[dependencies]
anyhow = "1.0.52"
chrono = { version="0.4", features = ["serde"] }
libcgroups = { version = "0.0.1", path = "../libcgroups" }
libcontainer = { version = "0.0.1", path = "../libcontainer" }
liboci-cli = { version = "0.0.1", path = "../liboci-cli" }
libcgroups = { version = "0.0.2", path = "../libcgroups" }
libcontainer = { version = "0.0.2", path = "../libcontainer" }
liboci-cli = { version = "0.0.2", path = "../liboci-cli" }
log = { version = "0.4", features = ["std"]}
nix = "0.23.1"
oci-spec = "0.5.3"
Expand Down

0 comments on commit a840866

Please sign in to comment.