Merge pull request containers#560 from cgwalters/image-inspect

cli: Add commands to output manifest and config

ci/priv-integration.sh

@@ -33,6 +33,8 @@ ostree-ext-cli container image prune-images --sysroot "${sysroot}"
 ostree-ext-cli container image deploy --sysroot "${sysroot}" \
     --stateroot "${stateroot}" --imgref "${imgref}"
 ostree admin --sysroot="${sysroot}" status
+ostree-ext-cli container image metadata --repo "${sysroot}/ostree/repo" registry:"${image}" > manifest.json
+jq '.schemaVersion' < manifest.json
 ostree-ext-cli container image remove --repo "${sysroot}/ostree/repo" registry:"${image}"
 ostree admin --sysroot="${sysroot}" undeploy 0
 # Now test the new syntax which has a nicer --image that defaults to registry.

lib/src/cli.rs

@@ -17,7 +17,7 @@ use ostree::{gio, glib};
 use std::borrow::Cow;
 use std::collections::BTreeMap;
 use std::ffi::OsString;
-use std::io::BufWriter;
+use std::io::{BufWriter, Write};
 use std::path::PathBuf;
 use std::process::Command;
 use tokio::sync::mpsc::Receiver;
@@ -241,6 +241,21 @@ pub(crate) enum ContainerImageOpts {
         imgref: ImageReference,
     },
 
+    /// Output manifest or configuration for an already stored container image.
+    Metadata {
+        /// Path to the repository
+        #[clap(long, value_parser)]
+        repo: Utf8PathBuf,
+
+        /// Container image reference, e.g. registry:quay.io/exampleos/exampleos:latest
+        #[clap(value_parser = parse_base_imgref)]
+        imgref: ImageReference,
+
+        /// Output the config, not the manifest
+        #[clap(long)]
+        config: bool,
+    },
+
     /// Copy a pulled container image from one repo to another.
     Copy {
         /// Path to the source repository
@@ -929,6 +944,27 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                     let repo = parse_repo(&repo)?;
                     container_history(&repo, &imgref).await
                 }
+                ContainerImageOpts::Metadata {
+                    repo,
+                    imgref,
+                    config,
+                } => {
+                    let repo = parse_repo(&repo)?;
+                    let image = crate::container::store::query_image_ref(&repo, &imgref)?
+                        .ok_or_else(|| anyhow::anyhow!("No such image"))?;
+                    let stdout = std::io::stdout().lock();
+                    let mut stdout = std::io::BufWriter::new(stdout);
+                    if config {
+                        let config = image
+                            .configuration
+                            .ok_or_else(|| anyhow::anyhow!("Missing configuration"))?;
+                        serde_json::to_writer(&mut stdout, &config)?;
+                    } else {
+                        serde_json::to_writer(&mut stdout, &image.manifest)?;
+                    }
+                    stdout.flush()?;
+                    Ok(())
+                }
                 ContainerImageOpts::Remove {
                     repo,
                     imgrefs,