From 8e40c130718043212e6d3add2ce1befcd1d38987 Mon Sep 17 00:00:00 2001 From: Nathan Holstein Date: Fri, 27 Sep 2024 16:54:25 -0400 Subject: [PATCH] fix: Support loading tarballs with older podman Older versions of Podman appear to handle loading a tarball differently depending upon with the input is /dev/stdin or not. In particular: podman load --input <(cat foo.tar) raises an error, while: cat foo.tar | podman load works without error. (Podman loads from stdin if no --input is specified.) This enables support for podman v3.4.4 included in Ubuntu 22.04. fixes #711 --- oci/private/load.sh.tpl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/oci/private/load.sh.tpl b/oci/private/load.sh.tpl index ccd4d6ea..27da865e 100644 --- a/oci/private/load.sh.tpl +++ b/oci/private/load.sh.tpl @@ -28,6 +28,5 @@ mtree_contents="$(cat $MTREE)" mtree_contents="${mtree_contents//"$image_root"/}" mtree_contents="${mtree_contents//"$manifest_root"/}" -"$CONTAINER_CLI" load --input <( - "$TAR" --cd "$RUNFILES_DIR/{{workspace_name}}" --create --no-xattr --no-mac-metadata @- <<< "$mtree_contents" -) +"$TAR" --cd "$RUNFILES_DIR/{{workspace_name}}" --create --no-xattr --no-mac-metadata @- <<< "$mtree_contents" | \ + "$CONTAINER_CLI" load