fix: always create conatiner with the images's platform

Author: queil

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rooz"
-version = "0.129.0"
+version = "0.130.0"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -1,5 +1,5 @@
 use crate::{
-    api::{image::ImageInfo, ContainerApi},
+    api::ContainerApi,
     constants,
     model::types::{AnyError, ContainerResult, OneShotResult, RunMode, RunSpec},
     util::{
@@ -245,13 +245,7 @@ impl<'a> ContainerApi<'a> {
 
         let options = CreateContainerOptions {
             name: Some(spec.container_name.to_string()),
-            platform: match image_info {
-                ImageInfo {
-                    platform: Some(platform),
-                    ..
-                } => platform,
-                _ => self.backend.platform.to_string(),
-            },
+            platform: image_info.platform.unwrap(),
         };
 
         let oom_score_adj = match self.backend.engine {

src/api/container.rs

@@ -26,6 +26,7 @@ impl<'a> ImageApi<'a> {
                     }
                     .to_string(),
                 ),
+                platform: self.backend.platform.to_string(),
                 ..Default::default()
             }),
             None,

src/api/image.rs

@@ -13,6 +13,7 @@ pub mod workspace;
 
 pub struct ImageApi<'a> {
     pub client: &'a Docker,
+    pub backend: &'a ContainerBackend,
 }
 
 pub struct ExecApi<'a> {

src/api/mod.rs

@@ -80,7 +80,10 @@ async fn main() -> Result<(), AnyError> {
         client: &docker,
         backend: &backend,
     };
-    let image_api = ImageApi { client: &docker };
+    let image_api = ImageApi {
+        client: &docker,
+        backend: &backend,
+    };
     let container_api = ContainerApi {
         client: &docker,
         image: &image_api,

src/main.rs

@@ -20,44 +20,47 @@ impl ContainerBackend {
         fn backend(info: &SystemInfo, version: &SystemVersion) -> ContainerBackend {
             if let SystemInfo {
                 operating_system: Some(name),
-                architecture: Some(architecture),
                 ..
             } = &info
             {
+                let os = &version.os.as_deref().unwrap();
+                let arch = &version.arch.as_deref().unwrap();
+                let platform = format!("{}/{}", os, arch);
+
                 match name.as_str() {
                     "Rancher Desktop WSL Distribution" => ContainerBackend {
                         engine: ContainerEngine::RancherDesktop,
-                        platform: architecture.to_string(),
+                        platform: platform.to_string(),
                     },
                     "Docker Desktop" => ContainerBackend {
                         engine: ContainerEngine::DockerDesktop,
-                        platform: architecture.to_string(),
+                        platform: platform.to_string(),
                     },
                     _ => {
                         if let Some(components) = &version.components {
                             if components.iter().any(|c| c.name == "Podman Engine") {
                                 ContainerBackend {
                                     engine: ContainerEngine::Podman,
-                                    platform: architecture.to_string(),
+                                    platform: platform.to_string(),
                                 }
                             } else {
                                 ContainerBackend {
                                     engine: ContainerEngine::Unknown,
-                                    platform: architecture.to_string(),
+                                    platform: platform.to_string(),
                                 }
                             }
                         } else {
                             ContainerBackend {
                                 engine: ContainerEngine::Unknown,
-                                platform: architecture.to_string(),
+                                platform: platform.to_string(),
                             }
                         }
                     }
                 }
             } else {
                 ContainerBackend {
                     engine: ContainerEngine::Unknown,
-                    platform: "Unknown".to_string(),
+                    platform: "unknown".to_string(),
                 }
             }
         }