From a910e094f77ba6d67349a561e5e9780becfe823a Mon Sep 17 00:00:00 2001 From: Ananta Bastola Date: Sun, 17 Dec 2023 02:19:43 -0500 Subject: [PATCH] fix(docker_context): ignore unix domain socket path from Docker Context (#5616) * fix(modules): ignore unix domain socket path from Docker Context fix #5548 * refactor(docker_context): ignore docker_context on unix domain socket path Closes #5548 --- src/modules/docker_context.rs | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/modules/docker_context.rs b/src/modules/docker_context.rs index 1c30001a..ad6c258a 100644 --- a/src/modules/docker_context.rs +++ b/src/modules/docker_context.rs @@ -57,7 +57,7 @@ pub fn module<'a>(context: &'a Context) -> Option> { } }; - if ctx == "default" { + if ctx == "default" || ctx.starts_with("unix://") { return None; } @@ -293,6 +293,24 @@ mod tests { cfg_dir.close() } + #[test] + fn test_docker_host_env_with_unix_path() -> io::Result<()> { + let cfg_dir = tempfile::tempdir()?; + + let actual = ModuleRenderer::new("docker_context") + .env("DOCKER_HOST", "unix:///run/user/1001/podman/podman.sock") + .config(toml::toml! { + [docker_context] + only_with_files = false + }) + .collect(); + let expected = None; + + assert_eq!(expected, actual); + + cfg_dir.close() + } + #[test] fn test_docker_context_env() -> io::Result<()> { let cfg_dir = tempfile::tempdir()?;