chore: use re-exported bollard from testcontainers to avoid collisions (#394)

Author: mervyn-mccreight

Cargo.toml

@@ -91,7 +91,6 @@ aws-sdk-dynamodb = "1.2.0"
 aws-sdk-s3 = "1.2.0"
 aws-sdk-sqs = "1.2.0"
 aws-types = "1.0.1"
-bollard = "0.19.1"
 databend-driver = "0.27.3"
 futures = "0.3"
 lapin = "3.0.0"

src/cncf_distribution/mod.rs

@@ -50,11 +50,17 @@ impl Image for CncfDistribution {
 
 #[cfg(test)]
 mod tests {
-    use bollard::query_parameters::{
-        CreateImageOptionsBuilder, PushImageOptionsBuilder, RemoveImageOptions,
-    };
     use futures::StreamExt;
-    use testcontainers::{runners::AsyncBuilder, GenericBuildableImage, Image};
+    use testcontainers::{
+        bollard::{
+            query_parameters::{
+                CreateImageOptionsBuilder, PushImageOptionsBuilder, RemoveImageOptions,
+            },
+            Docker,
+        },
+        runners::AsyncBuilder,
+        GenericBuildableImage, Image,
+    };
 
     use crate::{cncf_distribution, testcontainers::runners::AsyncRunner};
 
@@ -69,7 +75,7 @@ mod tests {
         let distribution_node = cncf_distribution::CncfDistribution::default()
             .start()
             .await?;
-        let docker = bollard::Docker::connect_with_local_defaults().unwrap();
+        let docker = Docker::connect_with_local_defaults().unwrap();
 
         let image_name = &format!(
             "localhost:{}/test",
@@ -123,6 +129,11 @@ mod tests {
             format!("{}:{}", image.name(), image.tag())
         );
 
+        // clean-up
+        docker
+            .remove_image(image.name(), None::<RemoveImageOptions>, None)
+            .await?;
+
         Ok(())
     }
 }