From 9a1892b4c8861043245c231cba7846eebb8acc80 Mon Sep 17 00:00:00 2001 From: David Cassany Date: Fri, 13 Dec 2024 10:56:10 +0100 Subject: [PATCH] Simplify podman calls in CI steup Ubuntu 24.04 ships podman v4 which fixes a v3 issue on loading images. With v4 loaded images keep the image name if present. Signed-off-by: David Cassany --- scripts/run_registry.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/run_registry.sh b/scripts/run_registry.sh index a22fe6e41a8..0a20bc35355 100755 --- a/scripts/run_registry.sh +++ b/scripts/run_registry.sh @@ -41,11 +41,9 @@ function push { # Ugly hack around podman to circumvent the need of adding insecure registries # at /etc/docker/daemon.json when using the docker client docker save "${img}" | podman load - tag=${img##*:} - imgID=$(podman images -n | grep "${tag}" | awk '{print $3}' | head -n1) - podman tag "${imgID}" "${reg_img}" + podman tag "${img}" "${reg_img}" podman push --tls-verify=false "${reg_img}" - podman rmi -f "${imgID}" + podman rmi -f "${img}" done }