Pass the platform config when pulling a image

Author: mominul

testcontainers/src/core/client.rs

@@ -445,10 +445,19 @@ impl Client {
         Ok(())
     }
 
-    pub(crate) async fn pull_image(&self, descriptor: &str) -> Result<(), ClientError> {
+    pub(crate) async fn pull_image(
+        &self,
+        descriptor: &str,
+        platform: Option<String>,
+    ) -> Result<(), ClientError> {
         let pull_options = CreateImageOptionsBuilder::new()
             .from_image(descriptor)
-            .platform(self.config.platform().unwrap_or_default())
+            .platform(
+                platform
+                    .as_ref()
+                    .map(|s| s.as_str())
+                    .unwrap_or_else(|| self.config.platform().unwrap_or_default()),
+            )
             .build();
 
         let credentials = self.credentials_for_image(descriptor).await;
@@ -462,7 +471,7 @@ impl Client {
                 Err(BollardError::DockerResponseServerError {
                     status_code: _,
                     message: _,
-                }) => {
+                }) if !matches!(platform.as_ref().map(|s| s.as_str()), Some("linux/amd64")) => {
                     self.pull_image_linux_amd64(descriptor).await?;
                 }
                 _ => {
@@ -708,7 +717,7 @@ mod tests {
         let config = env::Config::load::<OsEnvWithPlatformLinuxAmd64>().await?;
         let mut client = Client::new().await?;
         client.config = config;
-        client.pull_image("hello-world:latest").await?;
+        client.pull_image("hello-world:latest", None).await?;
 
         let image = client.bollard.inspect_image("hello-world:latest").await?;
 
@@ -718,7 +727,7 @@ mod tests {
         let config = env::Config::load::<OsEnvWithPlatformLinux386>().await?;
         let mut client = Client::new().await?;
         client.config = config;
-        client.pull_image("hello-world:latest").await?;
+        client.pull_image("hello-world:latest", None).await?;
 
         let image = client.bollard.inspect_image("hello-world:latest").await?;
 

testcontainers/src/core/image/image_ext.rs

@@ -70,7 +70,7 @@ pub trait ImageExt<I: Image> {
 
     /// Sets the platform the container will be run on.
     ///
-    /// Platform in the format os[/arch[/variant]] used for image lookup.
+    /// Platform in the format `os[/arch[/variant]]` used for image lookup.
     ///
     /// # Examples
     ///

testcontainers/src/runners/async_runner.rs

@@ -315,7 +315,12 @@ where
                     status_code: 404, ..
                 },
             )) => {
-                client.pull_image(&container_req.descriptor()).await?;
+                client
+                    .pull_image(
+                        &container_req.descriptor(),
+                        container_req.platform().clone(),
+                    )
+                    .await?;
                 client.create_container(create_options, config).await
             }
             res => res,
@@ -358,7 +363,12 @@ where
     async fn pull_image(self) -> Result<ContainerRequest<I>> {
         let container_req = self.into();
         let client = Client::lazy_client().await?;
-        client.pull_image(&container_req.descriptor()).await?;
+        client
+            .pull_image(
+                &container_req.descriptor(),
+                container_req.platform().clone(),
+            )
+            .await?;
 
         Ok(container_req)
     }