From c8d5de1798e461c5e610b2892c1c5842c9867f28 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Wed, 16 Oct 2019 15:07:18 -0400 Subject: [PATCH] ostree-installer: download Flatpaks from registry-no-cdn.fedoraproject.org The koji runroot used for to create the OSTree installer has no access to external networks, so use a special hostname for registry.fedoraproject.org that suppresses the redirects to the CDN that would normally happen for blob downloads. Signed-off-by: Owen W. Taylor --- fedora.conf | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/fedora.conf b/fedora.conf index 71b7214..8c25094 100644 --- a/fedora.conf +++ b/fedora.conf @@ -773,7 +773,9 @@ ostree_installer = [ "ostree_install_ref=fedora/rawhide/x86_64/silverblue", "ostree_update_ref=fedora/rawhide/x86_64/silverblue", "flatpak_remote_name=fedora", - "flatpak_remote_url=oci+https://registry.fedoraproject.org", + # using registry-no-cdn avoids redirects to the CDN; + # needed because of network restrictions on koji runroot + "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org", "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f30 app/org.gnome.Baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.Clocks/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.evince/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', @@ -797,7 +799,9 @@ ostree_installer = [ "ostree_install_ref=fedora/rawhide/ppc64le/silverblue", "ostree_update_ref=fedora/rawhide/ppc64le/silverblue", "flatpak_remote_name=fedora", - "flatpak_remote_url=oci+https://registry.fedoraproject.org", + # using registry-no-cdn avoids redirects to the CDN; + # needed because of network restrictions on koji runroot + "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org", "flatpak_remote_refs=", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', @@ -821,7 +825,9 @@ ostree_installer = [ "ostree_install_ref=fedora/rawhide/aarch64/silverblue", "ostree_update_ref=fedora/rawhide/aarch64/silverblue", "flatpak_remote_name=fedora", - "flatpak_remote_url=oci+https://registry.fedoraproject.org", + # using registry-no-cdn avoids redirects to the CDN; + # needed because of network restrictions on koji runroot + "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org", "flatpak_remote_refs=", ], 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',