consider all possible DOCKER_HOST value types, including tcp/http/https

shuttle-hq · Jan 15, 2025 · 2f7a0e1 · 2f7a0e1
1 parent 883c02e
commit 2f7a0e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/cargo-shuttle/src/provisioner_server.rs b/cargo-shuttle/src/provisioner_server.rs
@@ -41,7 +41,7 @@ impl LocalProvisioner {
         // This only constructs the client and does not try to connect.
         // If the socket is not found, a "no such file" error will happen on the first request to Docker.
         Ok(Self {
-            docker: Docker::connect_with_local_defaults()?,
+            docker: Docker::connect_with_defaults()?,
         })
     }
 

diff --git a/gateway/src/lib.rs b/gateway/src/lib.rs
@@ -383,7 +383,7 @@ pub mod tests {
 
     impl World {
         pub async fn new() -> Self {
-            let docker = Docker::connect_with_local_defaults().unwrap();
+            let docker = Docker::connect_with_defaults().unwrap();
 
             docker
                 .list_images::<&str>(None)

diff --git a/gateway/src/service.rs b/gateway/src/service.rs
@@ -325,7 +325,8 @@ impl GatewayService {
             ));
         }
 
-        let docker = Docker::connect_with_socket(&args.docker_host, 60, API_DEFAULT_VERSION).unwrap();
+        let docker =
+            Docker::connect_with_socket(&args.docker_host, 60, API_DEFAULT_VERSION).unwrap();
 
         let container_settings = ContainerSettings::builder().from_args(&args).await;