robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-10-01 08:44:09 +02:00
Code Issues Projects Releases Wiki Activity

miette

Browse source
This commit is contained in:
Robin Appelman 2022-01-11 17:22:51 +01:00
commit 701d3b2a82
20 changed files with 303 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/database.rs
View file

@ -3,8 +3,8 @@ use crate::image::pull_image;
use bollard::container::{Config, CreateContainerOptions, NetworkingConfig};
use bollard::models::{EndpointSettings, HostConfig};
use bollard::Docker;
use color_eyre::{eyre::WrapErr, Report, Result};
use maplit::hashmap;
use miette::{IntoDiagnostic, Report, Result, WrapErr};
use std::io::{stdout, Stdout};
use std::str::FromStr;
use std::time::Duration;
@ -208,8 +208,15 @@ impl Database {
},
..Default::default()
};
let id = docker.create_container(options, config).await?.id;
docker.start_container::<String>(&id, None).await?;
let id = docker
.create_container(options, config)
.await
.into_diagnostic()?
.id;
docker
.start_container::<String>(&id, None)
.await
.into_diagnostic()?;
Ok(Some(id))
}
@ -280,6 +287,7 @@ impl Database {
Ok(())
})
.await
.into_diagnostic()
.wrap_err("Timeout after 15 seconds")?
}
@ -297,7 +305,7 @@ impl Database {
Some(&mut output),
)
.await?;
let output = String::from_utf8(output)?;
let output = String::from_utf8(output).into_diagnostic()?;
Ok(!output.contains("ERROR"))
}
DatabaseFamily::Postgres => {