Skip to content

Commit ac90254

Browse files
committed
tools/unitctl: bump bollard and clarify docker client error
Signed-off-by: Ava Hahn <a.hahn@f5.com>
1 parent 1c75aab commit ac90254

File tree

4 files changed

+58
-52
lines changed

4 files changed

+58
-52
lines changed

tools/unitctl/Cargo.lock

Lines changed: 54 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/unitctl/unit-client-rs/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ default = ["serde_json/preserve_order"]
1515
[dependencies]
1616
custom_error = "1.9"
1717
hyper = { version = "0.14", features = ["stream"] }
18-
hyper-rustls = { version = "0.25.0", features = ["rustls-native-certs", "webpki-roots"] }
18+
hyper-rustls = { version = "0.25.0", features = ["rustls-native-certs", "webpki-roots", "http2"] }
1919
hyperlocal = "0.8"
2020
serde = { version = "1.0", features = ["derive"] }
2121
serde_json = "1.0"
@@ -27,7 +27,7 @@ which = "5.0"
2727

2828
unit-openapi = { path = "../unit-openapi" }
2929
rustls = "0.23.5"
30-
bollard = "0.16.1"
30+
bollard = "0.17.1"
3131
regex = "1.10.4"
3232
pbr = "1.1.1"
3333

tools/unitctl/unit-client-rs/src/unit_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ impl UnitClient {
191191
.unwrap_or_else(|_| HttpsConnectorBuilder::default()
192192
.with_webpki_roots())
193193
.https_or_http()
194-
.enable_http1()
194+
.enable_all_versions()
195195
.wrap_connector(HttpConnector::new()));
196196
Self {
197197
control_socket,

tools/unitctl/unit-client-rs/src/unitd_docker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl UnitdContainer {
144144
if let Ok(docker) = Docker::connect_with_local_defaults() {
145145
match docker.list_containers::<String>(None).await {
146146
Err(e) => {
147-
eprintln!("{}", e);
147+
eprintln!("Could not read docker instances: {}", e);
148148
vec![]
149149
}
150150
Ok(summary) => {

0 commit comments

Comments
 (0)