Skip to content

Commit ad82658

Browse files
authored
Try #1201:
2 parents 4645d93 + 5b0bf5c commit ad82658

File tree

5 files changed

+23
-11
lines changed

5 files changed

+23
-11
lines changed

.changes/962.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"description": "fix SELinux labels to allow use in multiple containers and/or the host filesystem.",
3+
"type": "fixed",
4+
"issues": [961]
5+
}

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased] - ReleaseDate
99

10+
## [v0.2.5] - 2023-02-03
11+
12+
## Fixed
13+
14+
- #962 - fix SELinux labels to allow use in multiple containers and/or the host filesystem.
15+
1016
## [v0.2.4] - 2022-07-10
1117

1218
## Fixed
@@ -364,7 +370,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
364370
<!-- prettier-ignore-start -->
365371
<!-- next-url -->
366372

367-
[Unreleased]: https://github.com/cross-rs/cross/compare/v0.2.4...HEAD
373+
[Unreleased]: https://github.com/cross-rs/cross/compare/v0.2.5...HEAD
374+
375+
[v0.2.5]: https://github.com/cross-rs/cross/compare/v0.2.4...v0.2.5
368376

369377
[v0.2.4]: https://github.com/cross-rs/cross/compare/v0.2.3...v0.2.4
370378

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ keywords = ["cross", "compilation", "testing", "tool"]
66
license = "MIT OR Apache-2.0"
77
name = "cross"
88
repository = "https://github.com/cross-rs/cross"
9-
version = "0.2.4"
9+
version = "0.2.5"
1010
edition = "2021"
1111
include = [
1212
"src/**/*",
@@ -66,7 +66,6 @@ once_cell = "1"
6666
walkdir = "2"
6767

6868
[package.metadata.release]
69-
dev-version = false
7069
push = false
7170
publish = false
7271
tag = false

src/docker/local.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,29 @@ pub(crate) fn run(
3939
docker_user_id(&mut docker, engine.kind);
4040

4141
docker
42-
.args(&["-v", &format!("{}:/xargo:Z", dirs.xargo.to_utf8()?)])
43-
.args(&["-v", &format!("{}:/cargo:Z", dirs.cargo.to_utf8()?)])
42+
.args(&["-v", &format!("{}:/xargo:z", dirs.xargo.to_utf8()?)])
43+
.args(&["-v", &format!("{}:/cargo:z", dirs.cargo.to_utf8()?)])
4444
// Prevent `bin` from being mounted inside the Docker container.
4545
.args(&["-v", "/cargo/bin"]);
4646
if mount_volumes {
4747
docker.args(&[
4848
"-v",
49-
&format!("{}:{}:Z", dirs.host_root.to_utf8()?, dirs.mount_root),
49+
&format!("{}:{}:z", dirs.host_root.to_utf8()?, dirs.mount_root),
5050
]);
5151
} else {
52-
docker.args(&["-v", &format!("{}:/project:Z", dirs.host_root.to_utf8()?)]);
52+
docker.args(&["-v", &format!("{}:/project:z", dirs.host_root.to_utf8()?)]);
5353
}
5454
docker
55-
.args(&["-v", &format!("{}:/rust:Z,ro", dirs.sysroot.to_utf8()?)])
56-
.args(&["-v", &format!("{}:/target:Z", dirs.target.to_utf8()?)]);
55+
.args(&["-v", &format!("{}:/rust:z,ro", dirs.sysroot.to_utf8()?)])
56+
.args(&["-v", &format!("{}:/target:z", dirs.target.to_utf8()?)]);
5757
docker_cwd(&mut docker, &paths, mount_volumes)?;
5858

5959
// When running inside NixOS or using Nix packaging we need to add the Nix
6060
// Store to the running container so it can load the needed binaries.
6161
if let Some(ref nix_store) = dirs.nix_store {
6262
docker.args(&[
6363
"-v",
64-
&format!("{}:{}:Z", nix_store.to_utf8()?, nix_store.as_posix()?),
64+
&format!("{}:{}:z", nix_store.to_utf8()?, nix_store.as_posix()?),
6565
]);
6666
}
6767

0 commit comments

Comments
 (0)