diff --git a/process/drivers.rs b/process/drivers.rs index 138d9e2..baed928 100644 --- a/process/drivers.rs +++ b/process/drivers.rs @@ -327,8 +327,8 @@ impl BuildDriver for Driver { impl_build_driver!(push(opts)) } - fn login(privileged: bool) -> Result<()> { - impl_build_driver!(login(privileged)) + fn login() -> Result<()> { + impl_build_driver!(login()) } #[cfg(feature = "prune")] diff --git a/process/drivers/buildah_driver.rs b/process/drivers/buildah_driver.rs index c140671..124704e 100644 --- a/process/drivers/buildah_driver.rs +++ b/process/drivers/buildah_driver.rs @@ -133,7 +133,7 @@ impl BuildDriver for BuildahDriver { Ok(()) } - fn login(_privileged: bool) -> Result<()> { + fn login() -> Result<()> { trace!("BuildahDriver::login()"); if let Some(Credentials { diff --git a/process/drivers/docker_driver.rs b/process/drivers/docker_driver.rs index 379a185..6aa11f3 100644 --- a/process/drivers/docker_driver.rs +++ b/process/drivers/docker_driver.rs @@ -221,7 +221,7 @@ impl BuildDriver for DockerDriver { Ok(()) } - fn login(_privileged: bool) -> Result<()> { + fn login() -> Result<()> { trace!("DockerDriver::login()"); if let Some(Credentials { diff --git a/process/drivers/podman_driver.rs b/process/drivers/podman_driver.rs index 9d2f3de..0bfa91f 100644 --- a/process/drivers/podman_driver.rs +++ b/process/drivers/podman_driver.rs @@ -253,7 +253,7 @@ impl BuildDriver for PodmanDriver { Ok(()) } - fn login(privileged: bool) -> Result<()> { + fn login() -> Result<()> { trace!("PodmanDriver::login()"); if let Some(Credentials { @@ -262,22 +262,11 @@ impl BuildDriver for PodmanDriver { password, }) = Credentials::get() { - let use_sudo = privileged && !running_as_root(); let output = pipe!( stdin = password; { let c = cmd!( - if use_sudo { - "sudo" - } else { - "podman" - }, - if use_sudo && has_env_var(SUDO_ASKPASS) => [ - "-A", - "-p", - SUDO_PROMPT, - ], - if use_sudo => "podman", + "podman", "login", "-u", username, diff --git a/process/drivers/traits.rs b/process/drivers/traits.rs index 9fbdb55..01d1876 100644 --- a/process/drivers/traits.rs +++ b/process/drivers/traits.rs @@ -106,7 +106,7 @@ pub trait BuildDriver: PrivateDriver { /// /// # Errors /// Will error if login fails. - fn login(privileged: bool) -> Result<()>; + fn login() -> Result<()>; /// Runs prune commands for the driver. /// diff --git a/src/commands/build.rs b/src/commands/build.rs index da8e25b..6efe40b 100644 --- a/src/commands/build.rs +++ b/src/commands/build.rs @@ -161,7 +161,7 @@ impl BlueBuildCommand for BuildCommand { if self.push { blue_build_utils::check_command_exists("cosign")?; Driver::check_signing_files(&CheckKeyPairOpts::builder().dir(Path::new(".")).build())?; - Driver::login(self.rechunk)?; + Driver::login()?; Driver::signing_login()?; } diff --git a/src/commands/login.rs b/src/commands/login.rs index 638d39c..e034b21 100644 --- a/src/commands/login.rs +++ b/src/commands/login.rs @@ -45,7 +45,7 @@ impl BlueBuildCommand for LoginCommand { .build(), ); - Driver::login(false)?; + Driver::login()?; Driver::signing_login()?; Ok(())