From 81a5eaf84e33bac28bdcd6d0e3fcd55266b1f47b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 9 Oct 2023 15:52:09 +0200 Subject: [PATCH] Switch ELN to a native container Relates: https://github.com/fedora-eln/eln/issues/164 Fixes: https://github.com/rpm-software-management/mock/issues/1238 --- mock-core-configs/etc/mock/templates/fedora-eln.tpl | 5 ++++- releng/release-notes-next/fedora-eln-image.config | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 releng/release-notes-next/fedora-eln-image.config diff --git a/mock-core-configs/etc/mock/templates/fedora-eln.tpl b/mock-core-configs/etc/mock/templates/fedora-eln.tpl index 1f5ea784f..23ca3c037 100644 --- a/mock-core-configs/etc/mock/templates/fedora-eln.tpl +++ b/mock-core-configs/etc/mock/templates/fedora-eln.tpl @@ -13,7 +13,10 @@ config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio diffutils f config_opts['dist'] = 'eln' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] config_opts['package_manager'] = 'dnf' -config_opts['bootstrap_image'] = 'fedora:latest' + +# Per https://github.com/fedora-eln/eln/issues/164 updated up to 4 times a day. +# Docs: https://docs.fedoraproject.org/en-US/eln/deliverables/#_container_image +config_opts['bootstrap_image'] = 'quay.io/fedoraci/fedora:eln' config_opts['dnf.conf'] = """ [main] diff --git a/releng/release-notes-next/fedora-eln-image.config b/releng/release-notes-next/fedora-eln-image.config new file mode 100644 index 000000000..afac267d3 --- /dev/null +++ b/releng/release-notes-next/fedora-eln-image.config @@ -0,0 +1,5 @@ +Previous versions of mock-core-configs referenced `fedora:latest` bootstrap +images for `fedora-rawhide-ARCH` chroots, which led to [package +incompatibilities][issue#1238]. Turns out ELN folks already provide a ["native" +ELN image](https://docs.fedoraproject.org/en-US/eln/deliverables/#_container_image) +so the new configs have switched to use that.