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

Use /proc/self/mountinfo as a fallback for docker inspect if using HOSTNAME fails #1485

Merged
merged 1 commit into from
May 7, 2024
Merged

Use /proc/self/mountinfo as a fallback for docker inspect if using HOSTNAME fails #1485

merged 1 commit into from
May 7, 2024

Conversation

thirteenowls
Copy link
Contributor

Fixes #1321.

@thirteenowls thirteenowls requested a review from a team as a code owner May 7, 2024 03:20
@Emilgardis
Copy link
Member

this is awesome! Isn't the description a bit misleading though? The fallback is actually docker now, not proc?

@thirteenowls
Copy link
Contributor Author

thirteenowls commented May 7, 2024 •
edited
Loading

Oh, you're right, it is ambiguous. Does "Use /proc/self/mountinfo as a fallback for docker inspect if using HOSTNAME fails" seem better to you?
(just in case, proc is the fallback, it first tries to use the hostname as usual and only reads mountinfo if that doesn't work)

@Emilgardis
Copy link
Member

I think that works!

Emilgardis
Emilgardis requested changes May 7, 2024
View reviewed changes
src/docker/shared.rs Show resolved Hide resolved
@thirteenowls thirteenowls changed the title Add /proc/self/mountinfo fallback if docker inspect $HOSTNAME fails Use /proc/self/mountinfo as a fallback for docker inspect if using HOSTNAME fails May 7, 2024
@thirteenowls
Copy link
Contributor Author

Done!

@Emilgardis
Copy link
Member

Thank you!

@Emilgardis Emilgardis added the no-ci-targets PRs that do not affect any cross-compilation targets. label May 7, 2024
@Emilgardis Emilgardis added this pull request to the merge queue May 7, 2024
Merged via the queue into cross-rs:main with commit 764d258 May 7, 2024
22 checks passed
@thirteenowls thirteenowls deleted the docker-inspect-fallback branch May 7, 2024 09:46
@Emilgardis Emilgardis mentioned this pull request Jul 17, 2024
Closed
@Emilgardis Emilgardis mentioned this pull request Nov 1, 2024
Open
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Emilgardis Emilgardis Emilgardis approved these changes

Assignees
No one assigned
Labels
no-ci-targets PRs that do not affect any cross-compilation targets.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Act: Build fails with sh: 1: cargo: not found
2 participants
@thirteenowls @Emilgardis