...

src/rhai/nerdctl.rs

@@ -25,7 +25,7 @@ fn nerdctl_error_to_rhai_error<T>(result: Result<T, NerdctlError>) -> Result<T,
                 format!("Data conversion error: {}. This may indicate unexpected output format from nerdctl.", msg)
             },
             NerdctlError::Other(msg) => {
-                format!("Nerdctl error: {}. This is an unexpected error.", msg)..
+                format!("Nerdctl error: {}. This is an unexpected error.", msg)
             },
         };
         
@@ -101,8 +101,64 @@ pub fn container_with_detach(mut container: Container, detach: bool) -> Containe
 }
 
 /// Build and run the Container
+///
+/// This function builds and runs the container using the configured options.
+/// It provides detailed error information if the build fails.
 pub fn container_build(container: Container) -> Result<Container, Box<EvalAltResult>> {
-    nerdctl_error_to_rhai_error(container.build())
+    // Get container details for better error reporting
+    let container_name = container.name.clone();
+    let image = container.image.clone().unwrap_or_else(|| "none".to_string());
+    let ports = container.ports.clone();
+    let volumes = container.volumes.clone();
+    let env_vars = container.env_vars.clone();
+    
+    // Try to build the container
+    let build_result = container.build();
+    
+    // Handle the result with improved error context
+    match build_result {
+        Ok(built_container) => {
+            // Container built successfully
+            Ok(built_container)
+        },
+        Err(err) => {
+            // Add more context to the error
+            let enhanced_error = match err {
+                NerdctlError::CommandFailed(msg) => {
+                    // Provide more detailed error information
+                    let mut enhanced_msg = format!("Failed to build container '{}' from image '{}': {}", 
+                        container_name, image, msg);
+                    
+                    // Add information about configured options that might be relevant
+                    if !ports.is_empty() {
+                        enhanced_msg.push_str(&format!("\nConfigured ports: {:?}", ports));
+                    }
+                    
+                    if !volumes.is_empty() {
+                        enhanced_msg.push_str(&format!("\nConfigured volumes: {:?}", volumes));
+                    }
+                    
+                    if !env_vars.is_empty() {
+                        enhanced_msg.push_str(&format!("\nConfigured environment variables: {:?}", env_vars));
+                    }
+                    
+                    // Add suggestions for common issues
+                    if msg.contains("not found") || msg.contains("no such image") {
+                        enhanced_msg.push_str("\nSuggestion: The specified image may not exist or may not be pulled yet. Try pulling the image first with nerdctl_image_pull().");
+                    } else if msg.contains("port is already allocated") {
+                        enhanced_msg.push_str("\nSuggestion: One of the specified ports is already in use. Try using a different port or stopping the container using that port.");
+                    } else if msg.contains("permission denied") {
+                        enhanced_msg.push_str("\nSuggestion: Permission issues detected. Check if you have the necessary permissions to create containers or access the specified volumes.");
+                    }
+                    
+                    NerdctlError::CommandFailed(enhanced_msg)
+                },
+                _ => err
+            };
+            
+            nerdctl_error_to_rhai_error(Err(enhanced_error))
+        }
+    }
 }
 
 /// Start the Container and verify it's running
@@ -139,7 +195,7 @@ pub fn container_start(container: &mut Container) -> Result<CommandResult, Box<E
                     }
                     
                     // Try to get more information about why the container might have failed to start
-                    let mut enhanced_msg = format!("Failed to start container '{}' (ID: {}): {}",
+                    let mut enhanced_msg = format!("Failed to start container '{}' (ID: {}): {}", 
                         container_name, container_id, msg);
                     
                     // Try to check if the image exists
@@ -172,6 +228,31 @@ pub fn container_exec(container: &mut Container, command: &str) -> Result<Comman
     nerdctl_error_to_rhai_error(container.exec(command))
 }
 
+/// Get container logs
+pub fn container_logs(container: &mut Container) -> Result<CommandResult, Box<EvalAltResult>> {
+    // Get container details for better error reporting
+    let container_name = container.name.clone();
+    let container_id = container.container_id.clone().unwrap_or_else(|| "unknown".to_string());
+    
+    // Use the nerdctl::logs function
+    let logs_result = nerdctl::logs(&container_id);
+    
+    match logs_result {
+        Ok(result) => {
+            Ok(result)
+        },
+        Err(err) => {
+            // Add more context to the error
+            let enhanced_error = NerdctlError::CommandFailed(
+                format!("Failed to get logs for container '{}' (ID: {}): {}",
+                    container_name, container_id, err)
+            );
+            
+            nerdctl_error_to_rhai_error(Err(enhanced_error))
+        }
+    }
+}
+
 /// Copy files between the Container and local filesystem
 pub fn container_copy(container: &mut Container, source: &str, dest: &str) -> Result<CommandResult, Box<EvalAltResult>> {
     nerdctl_error_to_rhai_error(container.copy(source, dest))
@@ -244,6 +325,13 @@ pub fn nerdctl_list(all: bool) -> Result<CommandResult, Box<EvalAltResult>> {
     nerdctl_error_to_rhai_error(nerdctl::list(all))
 }
 
+/// Wrapper for nerdctl::logs
+///
+/// Get container logs.
+pub fn nerdctl_logs(container: &str) -> Result<CommandResult, Box<EvalAltResult>> {
+    nerdctl_error_to_rhai_error(nerdctl::logs(container))
+}
+
 //
 // Image Function Wrappers
 //
@@ -330,6 +418,7 @@ pub fn register_nerdctl_module(engine: &mut Engine) -> Result<(), Box<EvalAltRes
     engine.register_fn("stop", container_stop);
     engine.register_fn("remove", container_remove);
     engine.register_fn("exec", container_exec);
+    engine.register_fn("logs", container_logs);
     engine.register_fn("copy", container_copy);
     
     // Register legacy container functions (for backward compatibility)
@@ -342,6 +431,7 @@ pub fn register_nerdctl_module(engine: &mut Engine) -> Result<(), Box<EvalAltRes
     engine.register_fn("nerdctl_stop", nerdctl_stop);
     engine.register_fn("nerdctl_remove", nerdctl_remove);
     engine.register_fn("nerdctl_list", nerdctl_list);
+    engine.register_fn("nerdctl_logs", nerdctl_logs);
     
     // Register image functions
     engine.register_fn("nerdctl_images", nerdctl_images);