fix(docker-compose): respect TESTCONTAINERS_COMMAND (#891)

Author: DDtKey

testcontainers/src/compose/client.rs

@@ -7,7 +7,7 @@ pub(super) mod local;
 
 pub(super) enum ComposeClient {
     Local(local::LocalComposeCli),
-    Containerised(containerised::ContainerisedComposeCli),
+    Containerised(Box<containerised::ContainerisedComposeCli>),
 }
 
 impl ComposeClient {
@@ -16,9 +16,9 @@ impl ComposeClient {
     }
 
     pub(super) async fn new_containerised(compose_files: Vec<PathBuf>) -> Result<Self> {
-        Ok(ComposeClient::Containerised(
+        Ok(ComposeClient::Containerised(Box::new(
             containerised::ContainerisedComposeCli::new(compose_files).await?,
-        ))
+        )))
     }
 }
 

testcontainers/src/compose/mod.rs

@@ -3,7 +3,8 @@ use std::{collections::HashMap, path::Path, sync::Arc};
 use crate::{
     compose::client::ComposeInterface,
     core::{
-        async_container::raw::RawContainer, async_drop, client::Client, wait::WaitStrategy, WaitFor,
+        async_container::raw::RawContainer, async_drop, client::Client, env, wait::WaitStrategy,
+        WaitFor,
     },
 };
 
@@ -222,7 +223,17 @@ impl Drop for DockerCompose {
         let client = self.client.clone();
         let rmi = self.remove_images;
         let volumes = self.remove_volumes;
+        let command = self
+            .docker_client
+            .as_ref()
+            .map(|client| client.config.command())
+            .unwrap_or(env::Command::Remove);
+
         let drop_task = async move {
+            if command != env::Command::Remove {
+                return;
+            }
+
             let res = client
                 .down(client::DownCommand {
                     project_name,

testcontainers/src/core/client.rs

@@ -427,7 +427,7 @@ impl Client {
         let stream = self
             .bollard
             .download_from_container(container_id, Some(options))
-            .map_err(|err| io::Error::new(io::ErrorKind::Other, err));
+            .map_err(io::Error::other);
         let reader = StreamReader::new(stream);
         Self::extract_file_entry(reader, target)
             .await

testcontainers/src/core/containers/mod.rs

@@ -5,7 +5,7 @@ pub(crate) mod request;
 #[cfg(feature = "blocking")]
 pub(crate) mod sync_container;
 
-pub use async_container::{exec::ExecResult, ContainerAsync};
+pub use async_container::{exec::ExecResult, raw::RawContainer, ContainerAsync};
 pub use request::{CgroupnsMode, ContainerRequest, Host, PortMapping};
 #[cfg(feature = "blocking")]
 #[cfg_attr(docsrs, doc(cfg(feature = "blocking")))]

testcontainers/src/core/copy.rs

@@ -75,7 +75,7 @@ impl CopyFileFromContainer for Vec<u8> {
 }
 
 #[async_trait(?Send)]
-impl<'a> CopyFileFromContainer for &'a mut Vec<u8> {
+impl CopyFileFromContainer for &mut Vec<u8> {
     type Output = ();
 
     async fn copy_from_reader<R>(

testcontainers/tests/async_runner.rs

@@ -4,7 +4,6 @@ use bollard::{
     query_parameters::{ListImagesOptions, RemoveImageOptions},
     Docker,
 };
-use tempfile;
 use testcontainers::{
     core::{
         client::ClientError,