From ddc17b2e236482ede71d763267341ec7f61fec82 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 4 Oct 2023 17:33:52 -0700 Subject: [PATCH] bodhi: switch skopeo command bodhi was using a small script to copy flatpak images from candidate registry to registry. This was done because skopeo wasn't able to copy multi-arch containers at the time. It has since gained the ability to do that and we should stop using the temporary script to do this. The script doesn't understand the new f39+ flatpaks hash passed to it so it fails to push them. This patch switches bodhi to use normal skopeo and pass it -a which should tell it to copy all the arches, not just the one it's running on. Signed-off-by: Kevin Fenzi --- roles/bodhi2/base/templates/production.ini.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 4f11556d2e..81dcddbe2b 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -202,10 +202,10 @@ pungi.extracmdline = --notification-script=/usr/bin/pungi-fedmsg-notification -- # You can put credentials for skopeo to use in $HOME/.docker/config.json # https://github.com/projectatomic/skopeo#private-registries-with-authentication # skopeo.cmd = /usr/bin/skopeo -skopeo.cmd = /usr/bin/bodhi-skopeo-lite +skopeo.cmd = /usr/bin/skopeo # Comma separated list of extra flags to pass to the skopeo copy command. -# skopeo.extra_copy_flags = +skopeo.extra_copy_flags = -a # Container hostnames. You can specify a port as well, using the traditional syntax (i.e., localhost:5000). # container.destination_registry = registry.fedoraproject.org