Merge pull request #414 from KMJ-007/master

fix: improve socket error handling

src/docker.rs

@@ -4,8 +4,9 @@ use std::fs;
 use std::future::Future;
 #[cfg(feature = "ssl")]
 use std::io;
+use std::path::Path;
 #[cfg(feature = "ssl")]
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::pin::Pin;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
@@ -641,12 +642,22 @@ impl Docker {
         timeout: u64,
         client_version: &ClientVersion,
     ) -> Result<Docker, Error> {
+        // Remove the scheme if present
+        let clean_path = path
+            .trim_start_matches("unix://")
+            .trim_start_matches("npipe://");
+
+        // Check if the socket file exists
+        if !std::path::Path::new(clean_path).exists() {
+            return Err(Error::SocketNotFoundError(clean_path.to_string()));
+        }
+
         #[cfg(unix)]
-        let docker = Docker::connect_with_unix(path, timeout, client_version);
+        let docker = Docker::connect_with_unix(path, timeout, client_version)?;
         #[cfg(windows)]
-        let docker = Docker::connect_with_named_pipe(path, timeout, client_version);
+        let docker = Docker::connect_with_named_pipe(path, timeout, client_version)?;
 
-        docker
+        Ok(docker)
     }
 
     /// Connect using a Unix socket, a Windows named pipe, or via HTTP.
@@ -749,6 +760,11 @@ impl Docker {
     ) -> Result<Docker, Error> {
         let client_addr = path.replacen("unix://", "", 1);
 
+        // check if the socket file exists and is accessible
+        if !Path::new(&client_addr).exists() {
+            return Err(Error::SocketNotFoundError(client_addr));
+        }
+
         let unix_connector = UnixConnector;
 
         let mut client_builder = Client::builder(TokioExecutor::new());

src/errors.rs

@@ -163,4 +163,7 @@ pub enum Error {
         /// The URI that was attempted to be connected to
         uri: String,
     },
+    /// Error emitted when the Docker socket file is not found at the expected location.
+    #[error("Socket not found: {0}")]
+    SocketNotFoundError(String),
 }

src/grpc/driver/docker_container.rs

@@ -118,7 +118,7 @@ impl Service<tonic::transport::Uri> for DockerContainer {
 ///
 /// ## Examples
 ///
-/// ```rust
+/// ```rust,no_run
 /// use bollard::grpc::driver::docker_container::DockerContainerBuilder;
 /// use bollard::Docker;
 ///