fix: Add driver args to rebase/upgrade command

src/commands.rs

@@ -67,8 +67,7 @@ pub enum CommandArgs {
     /// subcommand.
     ///
     /// NOTE: This can only be used if you have `rpm-ostree`
-    /// installed and if the `--push` and `--rebase` option isn't
-    /// used. This image will not be signed.
+    /// installed. This image will not be signed.
     #[command(visible_alias("update"))]
     Upgrade(local::UpgradeCommand),
 
@@ -80,7 +79,7 @@ pub enum CommandArgs {
     /// rebase onto the image using `oci-archive`.
     ///
     /// NOTE: This can only be used if you have `rpm-ostree`
-    /// installed.
+    /// installed. This image will not be signed.
     Rebase(local::RebaseCommand),
 
     /// Initialize a new Ublue Starting Point repo
@@ -99,15 +98,13 @@ pub enum CommandArgs {
 
 #[derive(Default, Clone, Copy, Debug, TypedBuilder, Args)]
 pub struct DriverArgs {
-    /// Puts the build in a `squash-stage` and
-    /// COPY's the results to the final stage
-    /// as one layer.
+    /// Runs all instructions inside one layer of the final image.
     ///
     /// WARN: This doesn't work with the
     /// docker driver as it has been deprecated.
     ///
     /// NOTE: Squash has a performance benefit for
-    /// the newer versions of podman and buildah.
+    /// podman and buildah when running inside a container.
     #[arg(short, long)]
     #[builder(default)]
     squash: bool,

src/commands/local.rs

@@ -14,7 +14,7 @@ use users::{Users, UsersCache};
 
 use crate::commands::build::BuildCommand;
 
-use super::BlueBuildCommand;
+use super::{BlueBuildCommand, DriverArgs};
 
 #[derive(Default, Clone, Debug, TypedBuilder, Args)]
 pub struct LocalCommonArgs {
@@ -36,6 +36,10 @@ pub struct LocalCommonArgs {
     #[arg(short, long)]
     #[builder(default)]
     force: bool,
+
+    #[clap(flatten)]
+    #[builder(default)]
+    drivers: DriverArgs,
 }
 
 #[derive(Default, Clone, Debug, TypedBuilder, Args)]
@@ -55,6 +59,7 @@ impl BlueBuildCommand for UpgradeCommand {
         let mut build = BuildCommand::builder()
             .recipe(self.common.recipe.clone())
             .archive(LOCAL_BUILD)
+            .drivers(self.common.drivers)
             .force(self.common.force)
             .build();
 
@@ -106,6 +111,7 @@ impl BlueBuildCommand for RebaseCommand {
         let mut build = BuildCommand::builder()
             .recipe(self.common.recipe.clone())
             .archive(LOCAL_BUILD)
+            .drivers(self.common.drivers)
             .force(self.common.force)
             .build();