diff --git a/lib/src/imgstorage.rs b/lib/src/imgstorage.rs index af116af1..93ec0f14 100644 --- a/lib/src/imgstorage.rs +++ b/lib/src/imgstorage.rs @@ -296,7 +296,7 @@ impl Storage { let storage_dest = &format!( "containers-storage:[overlay@{STORAGE_ALIAS_DIR}+/proc/self/fd/{STORAGE_RUN_FD}]" ); - cmd.args(["image", "push", image]) + cmd.args(["image", "push", "--remove-signatures", image]) .arg(format!("{storage_dest}{image}")); let mut cmd = AsyncCommand::from(cmd); cmd.run().await?; diff --git a/tests/booted/test-logically-bound-install.nu b/tests/booted/test-logically-bound-install.nu index 44facc31..bebdb6bb 100644 --- a/tests/booted/test-logically-bound-install.nu +++ b/tests/booted/test-logically-bound-install.nu @@ -6,5 +6,6 @@ print "IMAGES:" podman --storage-opt=additionalimagestore=/usr/lib/bootc/storage images # for debugging assert ($images | any {|item| $item.column1 == "quay.io/curl/curl"}) assert ($images | any {|item| $item.column1 == "quay.io/curl/curl-base"}) +assert ($images | any {|item| $item.column1 == "registry.redhat.io/ubi9/podman"}) # this image is signed tap ok diff --git a/tests/containerfiles/lbi/Containerfile b/tests/containerfiles/lbi/Containerfile index bf9f8e1e..7466e11e 100644 --- a/tests/containerfiles/lbi/Containerfile +++ b/tests/containerfiles/lbi/Containerfile @@ -3,4 +3,5 @@ FROM localhost/bootc COPY ./usr/. /usr RUN ln -s /usr/share/containers/systemd/curl.container /usr/lib/bootc/bound-images.d/curl.container && \ - ln -s /usr/share/containers/systemd/curl-base.image /usr/lib/bootc/bound-images.d/curl-base.image + ln -s /usr/share/containers/systemd/curl-base.image /usr/lib/bootc/bound-images.d/curl-base.image && \ + ln -s /usr/share/containers/systemd/podman.image /usr/lib/bootc/bound-images.d/podman.image diff --git a/tests/containerfiles/lbi/usr/share/containers/systemd/podman.image b/tests/containerfiles/lbi/usr/share/containers/systemd/podman.image new file mode 100644 index 00000000..77b5db6e --- /dev/null +++ b/tests/containerfiles/lbi/usr/share/containers/systemd/podman.image @@ -0,0 +1,2 @@ +[Image] +Image=registry.redhat.io/ubi9/podman:latest diff --git a/xtask/src/xtask.rs b/xtask/src/xtask.rs index b6026dd9..10f77e96 100644 --- a/xtask/src/xtask.rs +++ b/xtask/src/xtask.rs @@ -11,7 +11,11 @@ use fn_error_context::context; use xshell::{cmd, Shell}; const NAME: &str = "bootc"; -const TEST_IMAGES: &[&str] = &["quay.io/curl/curl-base:latest", "quay.io/curl/curl:latest"]; +const TEST_IMAGES: &[&str] = &[ + "quay.io/curl/curl-base:latest", + "quay.io/curl/curl:latest", + "registry.redhat.io/ubi9/podman:latest", +]; fn main() { if let Err(e) = try_main() {