examples: pull directly from containers storage

allisonkarlitskaya · cgwalters · commit 58f3e563dbf7 · 2025-04-04T10:00:49.000-04:00
Instead of having podman save our container images to a oci-archive and
pulling from that, save ourselves a bunch of work (including a gzip
compress/decompress cycle) by pulling directly from
`containers-storage:`.

Signed-off-by: Allison Karlitskaya &lt;allison.karlitskaya@redhat.com&gt;
diff --git a/examples/bls/build b/examples/bls/build
@@ -49,8 +49,7 @@ podman build \
     .
 
 BASE_ID="$(sed s/sha256:// tmp/base.iid)"
-podman save --format oci-archive -o tmp/base.tar "${BASE_ID}"
-${CFSCTL} oci pull oci-archive:tmp/base.tar
+${CFSCTL} oci pull containers-storage:${BASE_ID}
 BASE_IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${BASE_ID}")"
 fsck.erofs "tmp/sysroot/composefs/images/${BASE_IMAGE_FSVERITY}"
 
diff --git a/examples/uki/build b/examples/uki/build
@@ -41,8 +41,7 @@ ${PODMAN_BUILD} \
     .
 
 BASE_ID="$(sed s/sha256:// tmp/base.iid)"
-podman save --format oci-archive -o tmp/base.tar "${BASE_ID}"
-${CFSCTL} oci pull oci-archive:tmp/base.tar
+${CFSCTL} oci pull containers-storage:"${BASE_ID}"
 BASE_IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${BASE_ID}")"
 
 ${PODMAN_BUILD} \
@@ -54,8 +53,7 @@ ${PODMAN_BUILD} \
     .
 
 FINAL_ID="$(sed s/sha256:// tmp/final.iid)"
-podman save --format oci-archive -o tmp/final.tar "${FINAL_ID}"
-${CFSCTL} oci pull oci-archive:tmp/final.tar
+${CFSCTL} oci pull containers-storage:"${FINAL_ID}"
 FINAL_IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${FINAL_ID}")"
 fsck.erofs "tmp/sysroot/composefs/images/${FINAL_IMAGE_FSVERITY}"
 
diff --git a/examples/unified-secureboot/build b/examples/unified-secureboot/build
@@ -47,8 +47,7 @@ podman build \
     .
 
 IMAGE_ID="$(sed s/sha256:// tmp/iid)"
-podman save --format oci-archive -o tmp/final.tar "${IMAGE_ID}"
-${CFSCTL} oci pull oci-archive:tmp/final.tar
+${CFSCTL} oci pull containers-storage:"${IMAGE_ID}"
 IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${IMAGE_ID}")"
 fsck.erofs "tmp/sysroot/composefs/images/${IMAGE_FSVERITY}"
 
diff --git a/examples/unified/build b/examples/unified/build
@@ -29,8 +29,7 @@ podman build \
     .
 
 IMAGE_ID="$(sed s/sha256:// tmp/iid)"
-podman save --format oci-archive -o tmp/final.tar "${IMAGE_ID}"
-${CFSCTL} oci pull oci-archive:tmp/final.tar
+${CFSCTL} oci pull containers-storage:"${IMAGE_ID}"
 IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${IMAGE_ID}")"
 fsck.erofs "tmp/sysroot/composefs/images/${IMAGE_FSVERITY}"
 

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ podman build \`
`49`	`49`	`.`
`50`	`50`
`51`	`51`	`BASE_ID="$(sed s/sha256:// tmp/base.iid)"`
`52`		`-podman save --format oci-archive -o tmp/base.tar "${BASE_ID}"`
`53`		`-${CFSCTL} oci pull oci-archive:tmp/base.tar`
	`52`	`+${CFSCTL} oci pull containers-storage:${BASE_ID}`
`54`	`53`	`BASE_IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${BASE_ID}")"`
`55`	`54`	`fsck.erofs "tmp/sysroot/composefs/images/${BASE_IMAGE_FSVERITY}"`
`56`	`55`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ podman build \`
`47`	`47`	`.`
`48`	`48`
`49`	`49`	`IMAGE_ID="$(sed s/sha256:// tmp/iid)"`
`50`		`-podman save --format oci-archive -o tmp/final.tar "${IMAGE_ID}"`
`51`		`-${CFSCTL} oci pull oci-archive:tmp/final.tar`
	`50`	`+${CFSCTL} oci pull containers-storage:"${IMAGE_ID}"`
`52`	`51`	`IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${IMAGE_ID}")"`
`53`	`52`	`fsck.erofs "tmp/sysroot/composefs/images/${IMAGE_FSVERITY}"`
`54`	`53`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ podman build \`
`29`	`29`	`.`
`30`	`30`
`31`	`31`	`IMAGE_ID="$(sed s/sha256:// tmp/iid)"`
`32`		`-podman save --format oci-archive -o tmp/final.tar "${IMAGE_ID}"`
`33`		`-${CFSCTL} oci pull oci-archive:tmp/final.tar`
	`32`	`+${CFSCTL} oci pull containers-storage:"${IMAGE_ID}"`
`34`	`33`	`IMAGE_FSVERITY="$(${CFSCTL} oci create-image "${IMAGE_ID}")"`
`35`	`34`	`fsck.erofs "tmp/sysroot/composefs/images/${IMAGE_FSVERITY}"`
`36`	`35`