Skip to content

Commit 2f7a0e1

Browse files
author
Andrei Ormanji
committed
consider all possible DOCKER_HOST value types, including tcp/http/https
1 parent 883c02e commit 2f7a0e1

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

cargo-shuttle/src/provisioner_server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl LocalProvisioner {
4141
// This only constructs the client and does not try to connect.
4242
// If the socket is not found, a "no such file" error will happen on the first request to Docker.
4343
Ok(Self {
44-
docker: Docker::connect_with_local_defaults()?,
44+
docker: Docker::connect_with_defaults()?,
4545
})
4646
}
4747

gateway/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ pub mod tests {
383383

384384
impl World {
385385
pub async fn new() -> Self {
386-
let docker = Docker::connect_with_local_defaults().unwrap();
386+
let docker = Docker::connect_with_defaults().unwrap();
387387

388388
docker
389389
.list_images::<&str>(None)

gateway/src/service.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,8 @@ impl GatewayService {
325325
));
326326
}
327327

328-
let docker = Docker::connect_with_socket(&args.docker_host, 60, API_DEFAULT_VERSION).unwrap();
328+
let docker =
329+
Docker::connect_with_socket(&args.docker_host, 60, API_DEFAULT_VERSION).unwrap();
329330

330331
let container_settings = ContainerSettings::builder().from_args(&args).await;
331332

0 commit comments

Comments
 (0)