Rel/0.21.0

.github/workflows/security-reusable.yml

@@ -29,7 +29,7 @@ jobs:
           key: security-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Install cargo-audit
-        run: cargo install cargo-audit --locked
+        run: cargo install cargo-audit --locked --force
 
       - name: Security audit
         run: cargo audit

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "avocado-cli"
-version = "0.20.0"
+version = "0.21.0"
 edition = "2021"
 description = "Command line interface for Avocado."
 authors = ["Avocado"]

src/commands/build.rs

@@ -41,6 +41,10 @@ pub struct BuildCommand {
     pub dnf_args: Option<Vec<String>>,
     /// Disable stamp validation and writing
     pub no_stamps: bool,
+    /// Remote host to run on (format: user@host)
+    pub runs_on: Option<String>,
+    /// NFS port for remote execution
+    pub nfs_port: Option<u16>,
 }
 
 impl BuildCommand {
@@ -63,6 +67,8 @@ impl BuildCommand {
             container_args,
             dnf_args,
             no_stamps: false,
+            runs_on: None,
+            nfs_port: None,
         }
     }
 
@@ -72,6 +78,13 @@ impl BuildCommand {
         self
     }
 
+    /// Set remote execution options
+    pub fn with_runs_on(mut self, runs_on: Option<String>, nfs_port: Option<u16>) -> Self {
+        self.runs_on = runs_on;
+        self.nfs_port = nfs_port;
+        self
+    }
+
     /// Execute the build command
     pub async fn execute(&self) -> Result<()> {
         // Early target validation - load basic config first
@@ -143,7 +156,8 @@ impl BuildCommand {
                             self.container_args.clone(),
                             self.dnf_args.clone(),
                         )
-                        .with_no_stamps(self.no_stamps);
+                        .with_no_stamps(self.no_stamps)
+                        .with_runs_on(self.runs_on.clone(), self.nfs_port);
                         ext_build_cmd.execute().await.with_context(|| {
                             format!("Failed to build extension '{extension_name}'")
                         })?;
@@ -212,7 +226,8 @@ impl BuildCommand {
                             self.container_args.clone(),
                             self.dnf_args.clone(),
                         )
-                        .with_no_stamps(self.no_stamps);
+                        .with_no_stamps(self.no_stamps)
+                        .with_runs_on(self.runs_on.clone(), self.nfs_port);
                         ext_image_cmd.execute().await.with_context(|| {
                             format!("Failed to create image for extension '{extension_name}'")
                         })?;
@@ -275,7 +290,8 @@ impl BuildCommand {
                 self.container_args.clone(),
                 self.dnf_args.clone(),
             )
-            .with_no_stamps(self.no_stamps);
+            .with_no_stamps(self.no_stamps)
+            .with_runs_on(self.runs_on.clone(), self.nfs_port);
             runtime_build_cmd
                 .execute()
                 .await
@@ -600,7 +616,8 @@ impl BuildCommand {
             self.container_args.clone(),
             self.dnf_args.clone(),
         )
-        .with_no_stamps(self.no_stamps);
+        .with_no_stamps(self.no_stamps)
+        .with_runs_on(self.runs_on.clone(), self.nfs_port);
 
         // Execute the extension build using the external config
         match ext_build_cmd.execute().await {
@@ -661,7 +678,8 @@ impl BuildCommand {
             self.container_args.clone(),
             self.dnf_args.clone(),
         )
-        .with_no_stamps(self.no_stamps);
+        .with_no_stamps(self.no_stamps)
+        .with_runs_on(self.runs_on.clone(), self.nfs_port);
 
         // Execute the image creation
         ext_image_cmd.execute().await.with_context(|| {
@@ -917,7 +935,8 @@ echo "Successfully created image for versioned extension '$EXT_NAME-$EXT_VERSION
                     self.container_args.clone(),
                     self.dnf_args.clone(),
                 )
-                .with_no_stamps(self.no_stamps);
+                .with_no_stamps(self.no_stamps)
+                .with_runs_on(self.runs_on.clone(), self.nfs_port);
                 ext_build_cmd
                     .execute()
                     .await
@@ -954,7 +973,8 @@ echo "Successfully created image for versioned extension '$EXT_NAME-$EXT_VERSION
                     self.container_args.clone(),
                     self.dnf_args.clone(),
                 )
-                .with_no_stamps(self.no_stamps);
+                .with_no_stamps(self.no_stamps)
+                .with_runs_on(self.runs_on.clone(), self.nfs_port);
                 ext_image_cmd.execute().await.with_context(|| {
                     format!("Failed to create image for extension '{ext_name}'")
                 })?;
@@ -1070,7 +1090,8 @@ echo "Successfully created image for versioned extension '$EXT_NAME-$EXT_VERSION
                             self.container_args.clone(),
                             self.dnf_args.clone(),
                         )
-                        .with_no_stamps(self.no_stamps);
+                        .with_no_stamps(self.no_stamps)
+                        .with_runs_on(self.runs_on.clone(), self.nfs_port);
                         ext_build_cmd.execute().await.with_context(|| {
                             format!("Failed to build extension '{extension_name}'")
                         })?;
@@ -1084,7 +1105,8 @@ echo "Successfully created image for versioned extension '$EXT_NAME-$EXT_VERSION
                             self.container_args.clone(),
                             self.dnf_args.clone(),
                         )
-                        .with_no_stamps(self.no_stamps);
+                        .with_no_stamps(self.no_stamps)
+                        .with_runs_on(self.runs_on.clone(), self.nfs_port);
                         ext_image_cmd.execute().await.with_context(|| {
                             format!("Failed to create image for extension '{extension_name}'")
                         })?;
@@ -1150,7 +1172,8 @@ echo "Successfully created image for versioned extension '$EXT_NAME-$EXT_VERSION
             self.container_args.clone(),
             self.dnf_args.clone(),
         )
-        .with_no_stamps(self.no_stamps);
+        .with_no_stamps(self.no_stamps)
+        .with_runs_on(self.runs_on.clone(), self.nfs_port);
         runtime_build_cmd
             .execute()
             .await

src/commands/clean.rs

@@ -26,6 +26,8 @@ pub struct CleanCommand {
     config_path: Option<String>,
     /// Target architecture (needed for --stamps)
     target: Option<String>,
+    /// Force removal by killing and removing containers using the volume
+    force: bool,
 }
 
 impl CleanCommand {
@@ -50,6 +52,7 @@ impl CleanCommand {
             stamps: false,
             config_path: None,
             target: None,
+            force: false,
         }
     }
 
@@ -71,6 +74,12 @@ impl CleanCommand {
         self
     }
 
+    /// Set whether to force removal by killing containers
+    pub fn with_force(mut self, force: bool) -> Self {
+        self.force = force;
+        self
+    }
+
     /// Executes the clean command, removing volumes, state files, and optionally legacy directories.
     ///
     /// # Returns
@@ -174,12 +183,25 @@ fi
                 );
             }
 
-            volume_manager
-                .remove_volume(&volume_state.volume_name)
-                .await
-                .with_context(|| {
-                    format!("Failed to remove volume: {}", volume_state.volume_name)
-                })?;
+            if self.force {
+                // Force removal: kill and remove all containers using the volume first
+                volume_manager
+                    .force_remove_volume(&volume_state.volume_name)
+                    .await
+                    .with_context(|| {
+                        format!(
+                            "Failed to force remove volume: {}",
+                            volume_state.volume_name
+                        )
+                    })?;
+            } else {
+                volume_manager
+                    .remove_volume(&volume_state.volume_name)
+                    .await
+                    .with_context(|| {
+                        format!("Failed to remove volume: {}", volume_state.volume_name)
+                    })?;
+            }
 
             print_success(
                 &format!("Removed docker volume: {}", volume_state.volume_name),