Revert "fix: Use sudo for login when using rechunk"

This reverts commit 185a34f86b.
This commit is contained in:
Gerald Pinder 2025-03-26 14:36:30 -04:00
parent bd22b77430
commit 4b15468c3d
7 changed files with 9 additions and 20 deletions

View file

@ -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")]

View file

@ -133,7 +133,7 @@ impl BuildDriver for BuildahDriver {
Ok(())
}
fn login(_privileged: bool) -> Result<()> {
fn login() -> Result<()> {
trace!("BuildahDriver::login()");
if let Some(Credentials {

View file

@ -221,7 +221,7 @@ impl BuildDriver for DockerDriver {
Ok(())
}
fn login(_privileged: bool) -> Result<()> {
fn login() -> Result<()> {
trace!("DockerDriver::login()");
if let Some(Credentials {

View file

@ -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,

View file

@ -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.
///

View file

@ -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()?;
}

View file

@ -45,7 +45,7 @@ impl BlueBuildCommand for LoginCommand {
.build(),
);
Driver::login(false)?;
Driver::login()?;
Driver::signing_login()?;
Ok(())