container/encapsulate: Honor ostree.container-cmd

Builds on ostreedev/ostree-rs@6d3a69c Part of coreos/coreos-assembler#2685
cgwalters · Feb 4, 2022 · eb42ba3 · eb42ba3
1 parent db79b43
commit eb42ba3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/lib/src/container/encapsulate.rs b/lib/src/container/encapsulate.rs
@@ -121,7 +121,11 @@ fn build_oci(
     for (k, v) in config.labels.iter().map(|k| k.iter()).flatten() {
         labels.insert(k.into(), v.into());
     }
-    if let Some(cmd) = config.cmd.as_ref() {
+    // Lookup the cmd embedded in commit metadata
+    let cmd = commit_meta.lookup::<Vec<String>>(ostree::COMMIT_META_CONTAINER_CMD)?;
+    // But support it being overridden by CLI options
+    let cmd = config.cmd.as_ref().or_else(|| cmd.as_ref());
+    if let Some(cmd) = cmd {
         ctrcfg.set_cmd(Some(cmd.clone()));
     }
 

diff --git a/lib/tests/it/main.rs b/lib/tests/it/main.rs
@@ -54,7 +54,7 @@ fn generate_test_repo(dir: &Utf8Path) -> Result<Utf8PathBuf> {
         indoc! {"
         cd {dir}
         ostree --repo=repo init --mode=archive
-        ostree --repo=repo commit -b {testref} --bootable --no-bindings --add-metadata-string=version=42.0 --add-metadata-string=buildsys.checksum=41af286dc0b172ed2f1ca934fd2278de4a1192302ffa07087cea2682e7d372e3 --gpg-homedir={gpghome} --gpg-sign={keyid} \
+        ostree --repo=repo commit -b {testref} --bootable --no-bindings --add-metadata=ostree.container-cmd='[\"/usr/bin/bash\"]' --add-metadata-string=version=42.0 --add-metadata-string=buildsys.checksum=41af286dc0b172ed2f1ca934fd2278de4a1192302ffa07087cea2682e7d372e3 --gpg-homedir={gpghome} --gpg-sign={keyid} \
           --add-detached-metadata-string=my-detached-key=my-detached-value --tree=tar=exampleos.tar.zst >/dev/null
         ostree --repo=repo show {testref} >/dev/null
     "},
@@ -442,6 +442,14 @@ fn skopeo_inspect(imgref: &str) -> Result<String> {
     Ok(String::from_utf8(out.stdout)?)
 }
 
+fn skopeo_inspect_config(imgref: &str) -> Result<oci_spec::image::ImageConfiguration> {
+    let out = Command::new("skopeo")
+        .args(&["inspect", "--config", imgref])
+        .stdout(std::process::Stdio::piped())
+        .output()?;
+    Ok(serde_json::from_slice(&out.stdout)?)
+}
+
 #[tokio::test]
 async fn test_container_import_export() -> Result<()> {
     let fixture = Fixture::new()?;
@@ -462,7 +470,7 @@ async fn test_container_import_export() -> Result<()> {
                 .map(|(k, v)| (k.to_string(), v.to_string()))
                 .collect(),
         ),
-        cmd: Some(vec!["/bin/bash".to_string()]),
+        ..Default::default()
     };
     let opts = ostree_ext::container::ExportOpts {
         copy_meta_keys: vec!["buildsys.checksum".to_string()],
@@ -486,6 +494,20 @@ async fn test_container_import_export() -> Result<()> {
     assert!(inspect.contains(
         r#""buildsys.checksum": "41af286dc0b172ed2f1ca934fd2278de4a1192302ffa07087cea2682e7d372e3""#
     ));
+    let cfg = skopeo_inspect_config(&srcoci_imgref.to_string())?;
+    assert_eq!(
+        cfg.config()
+            .as_ref()
+            .unwrap()
+            .cmd()
+            .as_ref()
+            .unwrap()
+            .get(0)
+            .as_ref()
+            .unwrap()
+            .as_str(),
+        "/usr/bin/bash"
+    );
 
     let srcoci_unverified = OstreeImageReference {
         sigverify: SignatureSource::ContainerPolicyAllowInsecure,