[um42]: Backport changes

Author: GildedRoach

Dockerfile

@@ -7,8 +7,6 @@ RUN \
     dnf5 up -y &&\
     dnf5 swap -y systemd-standalone-sysusers systemd &&\
     dnf5 swap -y fedora-release-common ultramarine-release-common --allowerasing &&\
-    dnf5 in -y ultramarine-mock-configs subatomic-cli anda{,-srpm-macros} terra-appstream-helper mock-scm \
+    dnf5 in -y ultramarine-mock-configs ultramarine-mock-gpg-keys terra-mock-gpg-keys subatomic-cli anda{,-srpm-macros} terra-appstream-helper mock-scm \
         gh wget less podman fuse-overlayfs dnf5-plugins script mold sudo terra-sccache jq @buildsys-build &&\
-    dnf5 clean packages dbcache &&\
-    cp -pv /etc/pki/rpm-gpg/RPM-GPG-KEY-um* -t /etc/pki/mock &&\
-    cp -pv /etc/pki/rpm-gpg/RPM-GPG-KEY-terra* -t /etc/pki/mock
+    dnf5 clean packages dbcache

dnf.conf

@@ -47,7 +47,7 @@ baseurl=https://repos.fyralabs.com/terra$releasever-mesa
 type=rpm
 gpgkey=https://repos.fyralabs.com/terra$releasever-mesa/key.asc
 repo_gpgcheck=1
-enabled=0
+enabled=1
 enabled_metadata=1
 priority=80