tools/unitctl: bump bollard and clarify docker client error

Signed-off-by: Ava Hahn <[email protected]>
nginx · Sep 24, 2024 · ac90254 · ac90254
1 parent 1c75aab
commit ac90254
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 52 deletions.
diff --git a/tools/unitctl/Cargo.lock b/tools/unitctl/Cargo.lock
diff --git a/tools/unitctl/unit-client-rs/Cargo.toml b/tools/unitctl/unit-client-rs/Cargo.toml
@@ -15,7 +15,7 @@ default = ["serde_json/preserve_order"]
 [dependencies]
 custom_error = "1.9"
 hyper = { version = "0.14", features = ["stream"] }
-hyper-rustls = { version = "0.25.0", features = ["rustls-native-certs", "webpki-roots"] }
+hyper-rustls = { version = "0.25.0", features = ["rustls-native-certs", "webpki-roots", "http2"] }
 hyperlocal = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -27,7 +27,7 @@ which = "5.0"
 
 unit-openapi = { path = "../unit-openapi" }
 rustls = "0.23.5"
-bollard = "0.16.1"
+bollard = "0.17.1"
 regex = "1.10.4"
 pbr = "1.1.1"
 

diff --git a/tools/unitctl/unit-client-rs/src/unit_client.rs b/tools/unitctl/unit-client-rs/src/unit_client.rs
@@ -191,7 +191,7 @@ impl UnitClient {
                    .unwrap_or_else(|_| HttpsConnectorBuilder::default()
                                    .with_webpki_roots())
                    .https_or_http()
-                   .enable_http1()
+                   .enable_all_versions()
                    .wrap_connector(HttpConnector::new()));
         Self {
             control_socket,

diff --git a/tools/unitctl/unit-client-rs/src/unitd_docker.rs b/tools/unitctl/unit-client-rs/src/unitd_docker.rs
@@ -144,7 +144,7 @@ impl UnitdContainer {
         if let Ok(docker) = Docker::connect_with_local_defaults() {
             match docker.list_containers::<String>(None).await {
                 Err(e) => {
-                    eprintln!("{}", e);
+                    eprintln!("Could not read docker instances: {}", e);
                     vec![]
                 }
                 Ok(summary) => {