From f7f301f3dcf854d8c54ff0e9d3e0f474000daf0a Mon Sep 17 00:00:00 2001
From: bobslept <38557801+bobslept@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:50:14 +0200
Subject: [PATCH] feat: enable f39 builds (#500)

---
 .github/workflows/build.yml       |  5 ++++-
 Containerfile                     | 10 ++++++----
 dx/etc/yum.repos.d/docker-ce.repo |  2 +-
 packages.json                     | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cb73522db3c..2fdfdd919a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,11 +21,14 @@ jobs:
       matrix:
         image_flavor: [main, nvidia]
         base_name: [bluefin, bluefin-dx]
-        major_version: [38]
+        major_version: [38, 39]
         include:
           - major_version: 38
             is_latest_version: true
             is_stable_version: true
+          - major_version: 39
+            is_latest_version: true
+            is_stable_version: false
     steps:
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
diff --git a/Containerfile b/Containerfile
index a87758db60a..58193071e85 100644
--- a/Containerfile
+++ b/Containerfile
@@ -16,10 +16,12 @@ COPY etc/yum.repos.d/ /etc/yum.repos.d/
 COPY packages.json /tmp/packages.json
 COPY build.sh /tmp/build.sh
 
-# gnome-vrr
-RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
-RUN rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland
-RUN rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo
+# Exclude gnome-vrr from F39
+RUN if grep -qv "39" <<< "${FEDORA_MAJOR_VERSION}"; then \
+    wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
+    rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland && \
+    rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo \
+    ; fi
 
 ## bootc
 RUN wget https://copr.fedorainfracloud.org/coprs/rhcontainerbot/bootc/repo/fedora-"${FEDORA_MAJOR_VERSION}"/bootc-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/bootc.repo
diff --git a/dx/etc/yum.repos.d/docker-ce.repo b/dx/etc/yum.repos.d/docker-ce.repo
index 8a0de16042a..2b278532dd7 100644
--- a/dx/etc/yum.repos.d/docker-ce.repo
+++ b/dx/etc/yum.repos.d/docker-ce.repo
@@ -1,6 +1,6 @@
 [docker-ce-stable]
 name=Docker CE Stable - $basearch
-baseurl=https://download.docker.com/linux/fedora/$releasever/$basearch/stable
+baseurl=https://download.docker.com/linux/fedora/38/$basearch/stable
 enabled=1
 gpgcheck=1
 gpgkey=https://download.docker.com/linux/fedora/gpg
diff --git a/packages.json b/packages.json
index 50e6fcda2b2..76955ea238e 100644
--- a/packages.json
+++ b/packages.json
@@ -108,5 +108,19 @@
 			],
 			"bluefin-dx": []
 		}
+	},
+	"39": {
+		"include": {
+			"bluefin": [],
+			"bluefin-dx": [],
+			"bluefin-framework": []
+		},
+		"exclude": {
+			"bluefin": [
+				"podman-docker"
+			],
+			"bluefin-dx": [],
+			"bluefin-framework": []
+		}
 	}
 }