fix: Parse Version from container and remove ostree commit

integration-tests/legacy-test-repo/config/recipe.yml

@@ -41,4 +41,4 @@ modules:
     containerfiles:
       - labels
     snippets:
-      - RUN echo "This is a snippet" && ostree container commit
+      - RUN echo "This is a snippet"

integration-tests/test-repo/recipes/common.yml

@@ -41,7 +41,7 @@ modules:
     containerfiles:
       - labels
     snippets:
-      - RUN echo "This is a snippet" && ostree container commit
+      - RUN echo "This is a snippet"
 
   - type: copy
     from: alpine-test

integration-tests/test-repo/recipes/recipe-gts.yml

@@ -44,4 +44,4 @@ modules:
     containerfiles:
       - labels
     snippets:
-      - RUN echo "This is a snippet" && ostree container commit
+      - RUN echo "This is a snippet"

integration-tests/test-repo/recipes/recipe-invalid-from-file.yml

@@ -38,7 +38,7 @@ modules:
     containerfiles:
       - labels
     snippets:
-      - RUN echo "This is a snippet" && ostree container commit
+      - RUN echo "This is a snippet"
 
   - type: copy
     from: alpine-test

integration-tests/test-repo/recipes/recipe-invalid-module.yml

@@ -37,7 +37,7 @@ modules:
     containerfiles:
       labels: labels
     snippets:
-      - RUN echo "This is a snippet" && ostree container commit
+      - RUN echo "This is a snippet"
 
   - type: copy
     from: alpine-test

integration-tests/test-repo/recipes/recipe-invalid-stage.yml

@@ -41,7 +41,7 @@ modules:
     containerfiles:
       - labels
     snippets:
-      - RUN echo "This is a snippet" && ostree container commit
+      - RUN echo "This is a snippet"
 
   - type: copy
     from: alpine-test

integration-tests/test-repo/recipes/recipe-invalid.yml

@@ -39,7 +39,7 @@ modules:
     containerfiles:
       - labels
     snippets:
-      - RUN echo "This is a snippet" && ostree container commit
+      - RUN echo "This is a snippet"
 
   - type: copy
     from: alpine-test

process/drivers.rs

@@ -14,13 +14,14 @@ use std::{
     time::Duration,
 };
 
+use blue_build_utils::semver::Version;
 use bon::{Builder, bon};
 use cached::proc_macro::cached;
 use clap::Args;
 use colored::Colorize;
 use indicatif::{ProgressBar, ProgressStyle};
 use log::{info, trace, warn};
-use miette::{IntoDiagnostic, Result, miette};
+use miette::{Result, miette};
 use oci_distribution::Reference;
 use opts::{
     BuildOpts, BuildTagPushOpts, CheckKeyPairOpts, CreateContainerOpts, GenerateImageNameOpts,
@@ -216,6 +217,7 @@ impl Driver {
                 .build(),
         )
         .and_then(|inspection| {
+            trace!("{inspection:?}");
             inspection.get_version().ok_or_else(|| {
                 miette!(
                     "Failed to parse version from metadata for {}",
@@ -300,10 +302,10 @@ fn get_version_run_image(oci_ref: &Reference) -> Result<u64> {
     progress.finish_and_clear();
     Logger::multi_progress().remove(&progress);
 
-    String::from_utf8_lossy(&output.stdout)
+    Ok(String::from_utf8_lossy(&output.stdout)
         .trim()
-        .parse()
+        .parse::<Version>()?
-        .into_diagnostic()
+        .major)
 }
 
 macro_rules! impl_build_driver {

process/drivers/types.rs

@@ -10,7 +10,7 @@ use blue_build_utils::{
     semver::Version,
 };
 use clap::ValueEnum;
-use log::trace;
+use log::{trace, warn};
 use oci_distribution::Reference;
 use serde::Deserialize;
 use serde_json::Value;
@@ -247,7 +247,11 @@ impl ImageMetadata {
             self.labels
                 .get(IMAGE_VERSION_LABEL)
                 .map(ToOwned::to_owned)
-                .and_then(|v| serde_json::from_value::<Version>(v).ok())?
+                .and_then(|v| {
+                    serde_json::from_value::<Version>(v)
+                        .inspect_err(|e| warn!("Failed to parse version:\n{e}"))
+                        .ok()
+                })?
                 .major,
         )
     }

scripts/post_build.sh

@@ -3,4 +3,3 @@
 set -euo pipefail
 
 rm -rf /tmp/* /var/*
-ostree container commit

scripts/pre_build.sh

@@ -3,7 +3,9 @@
 set -euo pipefail
 
 if ! command -v jq > /dev/null; then
-  rpm-ostree install jq
+  if command -v rpm-ostree > /dev/null; then
+    rpm-ostree install jq
+  else
+    dnf -y install jq
+  fi
 fi
-
-ostree container commit

scripts/run_module.sh

@@ -66,7 +66,3 @@ else
   color_string "$(print_banner "Failed '${module}' Module")" "31"
   exit 1
 fi
-
-if command -v ostree > /dev/null; then
-  ostree container commit
-fi

src/commands/validate/yaml_span.rs

@@ -306,7 +306,7 @@ mod test {
     #[case(RECIPE, "/description", (109, 29))]
     #[case(RECIPE, "/image-version", (199, 6))]
     #[case(RECIPE, "/modules/4/source", (761, 5))]
-    #[case(RECIPE, "/modules/8/from", (1067, 11))]
+    #[case(RECIPE, "/modules/8/from", (1040, 11))]
     #[case(RECIPE_INVALID, "/image-version", (199, 6))]
     fn test_getspan(#[case] file: &str, #[case] path: &str, #[case] expected: (usize, usize)) {
         dbg!(path, expected);

template/templates/Containerfile.j2

@@ -26,20 +26,17 @@ ARG RUST_LOG_STYLE=always
 # Key RUN
 RUN --mount=type=bind,from=stage-keys,src=/keys,dst=/tmp/keys \
   mkdir -p /etc/pki/containers/ \
-  && cp /tmp/keys/* /etc/pki/containers/ \
+  && cp /tmp/keys/* /etc/pki/containers/
-  && ostree container commit
 
 # Bin RUN
 RUN --mount=type=bind,from=stage-bins,src=/bins,dst=/tmp/bins \
   mkdir -p /usr/bin/ \
-  && cp /tmp/bins/* /usr/bin/ \
+  && cp /tmp/bins/* /usr/bin/
-  && ostree container commit
 
 {%- if should_install_nu() %}
 RUN --mount=type=bind,from={{ blue_build_utils::constants::NUSHELL_IMAGE }}:{{ get_nu_version() }},src=/nu,dst=/tmp/nu \
   mkdir -p /usr/libexec/bluebuild/nu \
-  && cp -r /tmp/nu/* /usr/libexec/bluebuild/nu/ \
+  && cp -r /tmp/nu/* /usr/libexec/bluebuild/nu/
-  && ostree container commit
 {%- endif %}
 
 RUN --mount=type=bind,from={{ build_scripts_image }},src=/scripts/,dst=/scripts/ \

test-files/recipes/recipe-fail.yml

@@ -39,7 +39,7 @@ modules:
   - type: containerfile
     containerfiles: labels
     snippets:
-      - RUN echo "This is a snippet" && ostree container commit
+      - RUN echo "This is a snippet"
 
   - type: copy
     from: alpine-test

test-files/recipes/recipe-pass.yml

@@ -40,7 +40,7 @@ modules:
     containerfiles:
       - labels
     snippets:
-      - RUN echo "This is a snippet" && ostree container commit
+      - RUN echo "This is a snippet"
 
   - type: copy
     from: alpine-test