parent
457b6fa8ba
commit
c4feb418ce
1 changed files with 16 additions and 2 deletions
18
src/main.rs
18
src/main.rs
|
@ -217,12 +217,18 @@ pub fn build(image: &str, ci: bool) {
|
||||||
"bash", "-c", &cmd,
|
"bash", "-c", &cmd,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
Command::new("docker")
|
let cmd = if is_podman_installed() {
|
||||||
|
"podman"
|
||||||
|
} else {
|
||||||
|
"docker"
|
||||||
|
};
|
||||||
|
|
||||||
|
Command::new(cmd)
|
||||||
.stderr(Stdio::inherit())
|
.stderr(Stdio::inherit())
|
||||||
.stdout(Stdio::inherit())
|
.stdout(Stdio::inherit())
|
||||||
.args(args)
|
.args(args)
|
||||||
.status()
|
.status()
|
||||||
.expect("Failed to start Docker")
|
.expect("Failed to start Docker or podman")
|
||||||
};
|
};
|
||||||
|
|
||||||
if !status.success() {
|
if !status.success() {
|
||||||
|
@ -254,6 +260,14 @@ pub fn find_package_files() -> Vec<String> {
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_podman_installed() -> bool {
|
||||||
|
Command::new("podman")
|
||||||
|
.arg("--version")
|
||||||
|
.output()
|
||||||
|
.map(|output| output.status.success())
|
||||||
|
.unwrap_or(false)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn pacco_push(package: &str, repo: &str, signed: bool) {
|
pub fn pacco_push(package: &str, repo: &str, signed: bool) {
|
||||||
let pacco_domain = std::env::var("PACCO_HOST").unwrap();
|
let pacco_domain = std::env::var("PACCO_HOST").unwrap();
|
||||||
let pkg = package;
|
let pkg = package;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue