Skip to content

Fix in docker_inspect_self_mountinfo() fo Gitlab runner #1569

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix in docker_inspect_self_mountinfo() fo Gitlab runner #1569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/docker/shared.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,7 @@
let container_id = mountinfo
.lines()
.filter_map(|s| s.split(' ').nth(3))
.filter(|s| s.contains("/docker/"))
.filter(|s| s.contains("/docker/") || s.contains("/docker-data/")) // Check for both "/docker/" and "/docker-data/"
.flat_map(|s| s.split('/'))
.find(|s| s.len() == 64 && s.as_bytes().iter().all(u8::is_ascii_hexdigit))
.ok_or_else(|| eyre::eyre!("couldn't find container id in mountinfo"))?;
Expand Down Expand Up @@ -1747,7 +1747,7 @@
}

#[test]
#[cfg_attr(cross_sandboxed, ignore)]

Check warning on line 1750 in src/docker/shared.rs

View workflow job for this annotation

GitHub Actions / docker-in-docker 

unexpected `cfg` condition name: `cross_sandboxed`
fn test_host() -> Result<()> {
let vars = unset_env();
let mount_finder = MountFinder::new(vec![]);
Expand Down
Loading