From c34d6d6f82f4ae6716a4e29cca122afa849d7744 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Oct 07 2019 15:08:30 +0000
Subject: Embed applications into the Silverblue installer image (Fedora 31)


A long-term goal of Silverblue has been moving applications that
were previously part of the Workstation image into Flatpaks.
At this point, we many of the applications that were removed from
Silverblue available as Fedora Flatpaks, and we have the necessary
Anaconda support, so we should update the Silverblue images to include
the runtime and applications.

This is currently x86_64 only, since we don't have a working OSBS
cluster to build containers for aarch64 or ppc64le.

Note that Fedora Flatpaks are single-stream, so this embeds the
F30 runtime and applications into the F31 installer image. When
the applications are released for F31, the embedded runtime will
need to be updated.

Requires: https://pagure.io/fedora-lorax-templates/pull-request/41
Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>

---

diff --git a/fedora.conf b/fedora.conf
index 5a5f1e9..2fc077e 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -760,6 +760,9 @@ ostree_installer = [
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
                 "ostree_install_ref=fedora/31/x86_64/silverblue",
                 "ostree_update_ref=fedora/31/x86_64/silverblue",
+                "flatpak_remote_name=fedora",
+                "flatpak_remote_url=oci+https://registry.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',
             'template_branch': 'f31',
@@ -779,6 +782,9 @@ ostree_installer = [
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
                 "ostree_install_ref=fedora/31/ppc64le/silverblue",
                 "ostree_update_ref=fedora/31/ppc64le/silverblue",
+                "flatpak_remote_name=fedora",
+                "flatpak_remote_url=oci+https://registry.fedoraproject.org",
+                "flatpak_remote_refs=",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'f31',
@@ -798,6 +804,9 @@ ostree_installer = [
                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
                 "ostree_install_ref=fedora/31/aarch64/silverblue",
                 "ostree_update_ref=fedora/31/aarch64/silverblue",
+                "flatpak_remote_name=fedora",
+                "flatpak_remote_url=oci+https://registry.fedoraproject.org",
+                "flatpak_remote_refs=",
             ],
             'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
             'template_branch': 'f31',