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.

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

Fix docker_read_mount_paths to support podman. #792

Merged
merged 1 commit into from
Jun 14, 2022

Conversation

Alexhuszagh
Copy link
Contributor

Used to hard-code a search for docker, which is now removed to use the path of the located engine. Also adds the CROSS_CONTAINER_IN_CONTAINER environment variables, which overrides the CROSS_DOCKER_IN_DOCKER variable.

@Alexhuszagh Alexhuszagh requested a review from a team as a code owner June 14, 2022 16:02
@Alexhuszagh Alexhuszagh added bug A-container-engine Area: container engines labels Jun 14, 2022
Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm with maybe changing changelog entry

CHANGELOG.md Show resolved Hide resolved
let mount_finder = if docker_in_docker {
MountFinder::new(docker_read_mount_paths()?)
MountFinder::new(docker_read_mount_paths(&engine)?)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

Used to hard-code a search for docker, which is now removed to use the
path of the located engine. Also adds the `CROSS_CONTAINER_IN_CONTAINER`
environment variables, which overrides the `CROSS_DOCKER_IN_DOCKER`
variable.
Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors r+

@bors
Copy link
Contributor

bors bot commented Jun 14, 2022

Build succeeded:

@bors bors bot merged commit 150c892 into cross-rs:main Jun 14, 2022
@Emilgardis Emilgardis added this to the v0.2.2 milestone Jun 15, 2022
@Alexhuszagh Alexhuszagh deleted the docker_in_docker branch June 23, 2022 23:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-container-engine Area: container engines bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants