particle-os/particle-os-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Handle login for skopeo during rechunk flow

Browse source
This commit is contained in:
Gerald Pinder 2025-03-26 14:39:38 -04:00
parent 4b15468c3d
commit 9ffedf5314
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Earthfile
View file

@ -303,7 +303,8 @@ SAVE_IMAGE:
END END
ELSE ELSE
ARG EARTHLY_GIT_BRANCH ARG EARTHLY_GIT_BRANCH
SAVE IMAGE --push "${IMAGE}:${EARTHLY_GIT_BRANCH}${SUFFIX}" ARG IMAGE_TAG="$(echo "${EARTHLY_GIT_BRANCH}" | sed 's|/|_|g')"
SAVE IMAGE --push "${IMAGE}:${IMAGE_TAG}${SUFFIX}"
END END
ARG EARTHLY_GIT_HASH ARG EARTHLY_GIT_HASH
SAVE IMAGE --push "${IMAGE}:${EARTHLY_GIT_HASH}${SUFFIX}" SAVE IMAGE --push "${IMAGE}:${EARTHLY_GIT_HASH}${SUFFIX}"

3
process/drivers/skopeo_driver.rs
View file

@ -1,6 +1,5 @@
use std::{process::Stdio, time::Duration}; use std::{process::Stdio, time::Duration};
use blue_build_utils::constants::SUDO_ASKPASS;
use cached::proc_macro::cached; use cached::proc_macro::cached;
use colored::Colorize; use colored::Colorize;
use comlexr::cmd; use comlexr::cmd;
@ -77,7 +76,7 @@ impl super::OciCopy for SkopeoDriver {
} else { } else {
"skopeo" "skopeo"
}, },
if use_sudo && blue_build_utils::has_env_var(SUDO_ASKPASS) => [ if use_sudo && blue_build_utils::has_env_var(blue_build_utils::constants::SUDO_ASKPASS) => [
"-A", "-A",
"-p", "-p",
format!( format!(

2
process/drivers/traits.rs
View file

@ -287,6 +287,8 @@ pub trait RechunkDriver: RunDriver + BuildDriver + ContainerMountDriver {
)) ))
.into_diagnostic()?; .into_diagnostic()?;
Self::login()?;
Self::build( Self::build(
&BuildOpts::builder() &BuildOpts::builder()
.image(raw_image.to_string()) .image(raw_image.to_string())