Skip to content

Commit 84abc68

Browse files
chore(deps): bump bollard from 0.19.2 to 0.20.2 (#25026)
* chore(deps): bump bollard from 0.19.2 to 0.20.2 Bumps [bollard](https://github.com/fussybeaver/bollard) from 0.19.2 to 0.20.2. - [Release notes](https://github.com/fussybeaver/bollard/releases) - [Changelog](https://github.com/fussybeaver/bollard/blob/master/RELEASE.md) - [Commits](fussybeaver/bollard@v0.19.2...v0.20.2) --- updated-dependencies: - dependency-name: bollard dependency-version: 0.20.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Bump bollard in Cargo.toml * Fix incompatible changes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Thomas <thomas.schneider@datadoghq.com>
1 parent 9337c80 commit 84abc68

4 files changed

Lines changed: 9 additions & 13 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ arrow-schema = { version = "56.2.0", default-features = false, optional = true }
354354
axum = { version = "0.6.20", default-features = false }
355355
base64 = { workspace = true, optional = true }
356356
bloomy = { version = "1.2.0", default-features = false, optional = true }
357-
bollard = { version = "0.19.1", default-features = false, features = ["pipe", "ssl", "chrono"], optional = true }
357+
bollard = { version = "0.20", default-features = false, features = ["pipe", "ssl", "chrono"], optional = true }
358358
bytes = { workspace = true, features = ["serde"] }
359359
bytesize = { version = "2.0.1", default-features = false }
360360
chrono.workspace = true

src/docker.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ use std::{collections::HashMap, env, path::PathBuf};
44
use bollard::{
55
API_DEFAULT_VERSION, Docker,
66
errors::Error as DockerError,
7-
models::HostConfig,
7+
models::{ContainerCreateBody, HostConfig},
88
query_parameters::{
99
CreateContainerOptionsBuilder, CreateImageOptionsBuilder, ListImagesOptionsBuilder,
1010
RemoveContainerOptions, StartContainerOptions, StopContainerOptions,
1111
},
12-
secret::ContainerCreateBody,
1312
};
1413
use futures::StreamExt;
1514
use http::uri::Uri;
@@ -130,7 +129,7 @@ async fn pull_image(docker: &Docker, image: &str, tag: &str) {
130129
.create_image(options, None, None)
131130
.for_each(|item| async move {
132131
let info = item.unwrap();
133-
if let Some(error) = info.error {
132+
if let Some(error) = info.error_detail {
134133
panic!("{error:?}");
135134
}
136135
})

src/sources/docker_logs/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ mod integration_tests {
3030
}
3131

3232
use bollard::{
33+
models::ContainerCreateBody,
3334
query_parameters::{
3435
CreateContainerOptionsBuilder, CreateImageOptionsBuilder, KillContainerOptions,
3536
ListImagesOptionsBuilder, RemoveContainerOptions, StartContainerOptions,
3637
WaitContainerOptions,
3738
},
38-
secret::ContainerCreateBody,
3939
};
4040
use futures::{FutureExt, stream::TryStreamExt};
4141
use itertools::Itertools as _;
@@ -182,7 +182,7 @@ mod integration_tests {
182182
.create_image(options, None, None)
183183
.for_each(|item| async move {
184184
let info = item.unwrap();
185-
if let Some(error) = info.error {
185+
if let Some(error) = info.error_detail {
186186
panic!("{error:?}");
187187
}
188188
})

0 commit comments

Comments
 (0)