osbuild: leverage local container-storage when possible

In the case where we built the container inside the supermin VM then
the container is available in the container-storage inside the supermin
VM already so let's use the org.osbuild.containers-storage input type
here for that.

Author: dustymabe

src/cmd-osbuild

@@ -229,6 +229,9 @@ cloud-image-size: "${cloud_image_size_mb}"
 # Note: this is only used in the secex case; there, the rootfs is
 # not the last partition on the disk so we need to explicitly size it
 rootfs-size: "${rootfs_size_mb}"
+# "localhost/${name}:${build}" was the default name:tag used by cmd-build-with-buildah
+container-repo: "localhost/${name}"
+container-tag: "${build}"
 EOF
 }
 

src/osbuild-manifests/coreos.osbuild.x86_64.mpp.yaml

@@ -139,7 +139,7 @@ pipelines:
           type: org.osbuild.container-deploy
           inputs:
             images:
-              type: org.osbuild.containers
+              type: org.osbuild.containers-storage
               origin: org.osbuild.source
               mpp-resolve-images:
                 images:
@@ -227,7 +227,7 @@ pipelines:
               - mpp-format-string: '{extra_kargs}'
           inputs:
             images:
-              type: org.osbuild.containers
+              type: org.osbuild.containers-storage
               origin: org.osbuild.source
               mpp-resolve-images:
                 images:

src/runvm-osbuild

@@ -72,6 +72,14 @@ container_repo=$(getconfig_def "container-repo" "")
 container_tag=$(getconfig_def "container-tag" "")
 extra_kargs=$(getconfig "extra-kargs-string" "")
 
+# Since the underlying osbuild manifests will prefer the ociarchive
+# if it exists then let's check here to see if the container exists
+# in local container storage. If it does then we'll just pass that
+# and not pass any ociarchive info into the build.
+if podman image exists "${container_repo}:${container_tag}"; then
+    ostree_container=""
+fi
+
 # Since it doesn't exist create loop-control
 [ ! -e /dev/loop-control ] && mknod /dev/loop-control c 10 237