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

fix: Run image as fallback for version retrieval

Browse source
This commit is contained in:
Gerald Pinder 2024-09-29 13:53:18 -04:00
parent 37a69df832
commit 20d1950530
6 changed files with 91 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

5
process/drivers/docker_driver.rs
View file

@ -13,6 +13,7 @@ use blue_build_utils::{
credentials::Credentials,
string_vec,
};
use colored::Colorize;
use indicatif::{ProgressBar, ProgressStyle};
use log::{debug, info, trace, warn};
use miette::{bail, IntoDiagnostic, Result};
@ -317,7 +318,7 @@ impl InspectDriver for DockerDriver {
let progress = Logger::multi_progress().add(
ProgressBar::new_spinner()
.with_style(ProgressStyle::default_spinner())
.with_message(format!("Inspecting metadata for {url}")),
.with_message(format!("Inspecting metadata for {}", url.bold())),
);
progress.enable_steady_tick(Duration::from_millis(100));
@ -330,7 +331,7 @@ impl InspectDriver for DockerDriver {
)
.into_diagnostic()?;
progress.finish();
progress.finish_and_clear();
Logger::multi_progress().remove(&progress);
if output.status.success() {

4
process/drivers/podman_driver.rs
View file

@ -194,7 +194,7 @@ impl InspectDriver for PodmanDriver {
let progress = Logger::multi_progress().add(
ProgressBar::new_spinner()
.with_style(ProgressStyle::default_spinner())
.with_message(format!("Inspecting metadata for {url}")),
.with_message(format!("Inspecting metadata for {}", url.bold())),
);
progress.enable_steady_tick(Duration::from_millis(100));
@ -207,7 +207,7 @@ impl InspectDriver for PodmanDriver {
)
.into_diagnostic()?;
progress.finish();
progress.finish_and_clear();
Logger::multi_progress().remove(&progress);
if output.status.success() {

5
process/drivers/skopeo_driver.rs
View file

@ -1,6 +1,7 @@
use std::{process::Stdio, time::Duration};
use blue_build_utils::cmd;
use colored::Colorize;
use indicatif::{ProgressBar, ProgressStyle};
use log::{debug, trace};
use miette::{bail, IntoDiagnostic, Result};
@ -24,7 +25,7 @@ impl InspectDriver for SkopeoDriver {
let progress = Logger::multi_progress().add(
ProgressBar::new_spinner()
.with_style(ProgressStyle::default_spinner())
.with_message(format!("Inspecting metadata for {url}")),
.with_message(format!("Inspecting metadata for {}", url.bold())),
);
progress.enable_steady_tick(Duration::from_millis(100));
@ -34,7 +35,7 @@ impl InspectDriver for SkopeoDriver {
.output()
.into_diagnostic()?;
progress.finish();
progress.finish_and_clear();
Logger::multi_progress().remove(&progress);
if output.status.success() {