admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix panic during container update (#445)

Browse Source
This commit is contained in:
SteveLauC
2023-05-27 22:12:45 +08:00
committed by GitHub
parent 1ab0232d96
commit 5358509825
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/steps/containers.rs
View File

@@ -24,7 +24,7 @@ const NONEXISTENT_REPO: &str = "repository does not exist";
struct Container { struct Container {
/// `Repository` and `Tag` /// `Repository` and `Tag`
/// ///
/// format: `Repository:Tag`, e.g., `fedora:latest`. /// format: `Repository:Tag`, e.g., `nixos/nix:latest`.
repo_tag: String, repo_tag: String,
/// Platform /// Platform
/// ///
@@ -41,7 +41,7 @@ impl Container {
impl Display for Container { impl Display for Container {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
// e.g., "`fedora/latest` for `linux/amd64`" // e.g., "`fedora:latest` for `linux/amd64`"
write!(f, "`{}` for `{}`", self.repo_tag, self.platform) write!(f, "`{}` for `{}`", self.repo_tag, self.platform)
} }
} }
@@ -54,7 +54,7 @@ fn list_containers(crt: &Path) -> Result<Vec<Container>> {
crt.display() crt.display()
); );
let output = Command::new(crt) let output = Command::new(crt)
.args(["image", "ls", "--format", "{{.Repository}}:{{.Tag}}/{{.ID}}"]) .args(["image", "ls", "--format", "{{.Repository}}:{{.Tag}} {{.ID}}"])
.output_checked_with_utf8(|_| Ok(()))?; .output_checked_with_utf8(|_| Ok(()))?;
let mut retval = vec![]; let mut retval = vec![];
@@ -78,8 +78,8 @@ fn list_containers(crt: &Path) -> Result<Vec<Container>> {
debug!("Using container '{}'", line); debug!("Using container '{}'", line);
// line is of format: `Repository:Tag/ImageID`, e.g., `fedora:latest/be300d2b6d94`. // line is of format: `Repository:Tag ImageID`, e.g., `nixos/nix:latest d80fea9c32b4`
let split_res = line.split('/').collect::<Vec<&str>>(); let split_res = line.split(' ').collect::<Vec<&str>>();
assert_eq!(split_res.len(), 2); assert_eq!(split_res.len(), 2);
let (repo_tag, image_id) = (split_res[0], split_res[1]); let (repo_tag, image_id) = (split_res[0], split_res[1]);