From 6984a9e7ff23eefcdfd6026fd6bbc3dcf018d6bd Mon Sep 17 00:00:00 2001
From: Anders Rytter Hansen <andersr+github@rytter.me>
Date: Tue, 2 Jan 2024 00:08:54 +0100
Subject: [PATCH] upgrade to Fedora 39

---
 .github/workflows/base.yml          |  2 +-
 .github/workflows/kernel-akmods.yml |  2 +-
 .github/workflows/os.yml            |  2 +-
 Dockerfile                          |  4 ++--
 base.Dockerfile                     |  4 ++--
 kernel-akmods.Dockerfile            | 10 +++++-----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index b1caa4e..356eb29 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -87,7 +87,7 @@ jobs:
           containerfiles: |
             ./base.Dockerfile
           image: ${{ env.IMAGE_NAME }}
-          tags: ${{ steps.meta.outputs.tags }} ${{ steps.meta.outputs.tags }}-38 ${{ steps.meta.outputs.tags }}-38.${{ steps.date.outputs.date }}
+          tags: ${{ steps.meta.outputs.tags }} ${{ steps.meta.outputs.tags }}-39 ${{ steps.meta.outputs.tags }}-39.${{ steps.date.outputs.date }}
           oci: false
 
       # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
diff --git a/.github/workflows/kernel-akmods.yml b/.github/workflows/kernel-akmods.yml
index 891ee34..22c50f2 100644
--- a/.github/workflows/kernel-akmods.yml
+++ b/.github/workflows/kernel-akmods.yml
@@ -86,7 +86,7 @@ jobs:
           containerfiles: |
             ./kernel-akmods.Dockerfile
           image: ${{ env.IMAGE_NAME }}
-          tags: ${{ steps.meta.outputs.tags }} ${{ steps.meta.outputs.tags }}-38 ${{ steps.meta.outputs.tags }}-38.${{ steps.date.outputs.date }}
+          tags: ${{ steps.meta.outputs.tags }} ${{ steps.meta.outputs.tags }}-39 ${{ steps.meta.outputs.tags }}-39.${{ steps.date.outputs.date }}
           oci: false
 
       # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
diff --git a/.github/workflows/os.yml b/.github/workflows/os.yml
index f7ae8ce..ce1983c 100644
--- a/.github/workflows/os.yml
+++ b/.github/workflows/os.yml
@@ -91,7 +91,7 @@ jobs:
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}, ${{ steps.meta.outputs.tags }}-38, ${{ steps.meta.outputs.tags }}-38.${{ steps.date.outputs.date }}
+          tags: ${{ steps.meta.outputs.tags }}, ${{ steps.meta.outputs.tags }}-39, ${{ steps.meta.outputs.tags }}-39.${{ steps.date.outputs.date }}
        #   labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/Dockerfile b/Dockerfile
index d6131ef..197fb2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 ARG IMAGE_NAME="${IMAGE_NAME:-kinoite}"
 ARG SOURCE_IMAGE="${SOURCE_IMAGE:-kinoite}"
 ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
 
 
-FROM ghcr.io/andersrh/my-ostree-os-kernel-akmods:main-38 AS builder
+FROM ghcr.io/andersrh/my-ostree-os-kernel-akmods:main-39 AS builder
 
 ARG CACHEBUST=0
 ARG IMAGE_NAME="${IMAGE_NAME}"
diff --git a/base.Dockerfile b/base.Dockerfile
index 66aeef2..eda4c1c 100644
--- a/base.Dockerfile
+++ b/base.Dockerfile
@@ -1,10 +1,10 @@
 ARG IMAGE_NAME="${IMAGE_NAME:-kinoite}"
 ARG SOURCE_IMAGE="${SOURCE_IMAGE:-kinoite}"
 ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
  
 
-FROM quay.io/fedora-ostree-desktops/kinoite:38 AS builder
+FROM quay.io/fedora-ostree-desktops/kinoite:39 AS builder
 
 ARG CACHEBUST=2
 
diff --git a/kernel-akmods.Dockerfile b/kernel-akmods.Dockerfile
index 77fb69f..a502707 100644
--- a/kernel-akmods.Dockerfile
+++ b/kernel-akmods.Dockerfile
@@ -1,9 +1,9 @@
 ARG IMAGE_NAME="${IMAGE_NAME:-kinoite}"
 ARG SOURCE_IMAGE="${SOURCE_IMAGE:-kinoite}"
 ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}"
-ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
+ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
 
-FROM fedora:38 AS akmods-builder
+FROM fedora:39 AS akmods-builder
 
 RUN dnf -y update && dnf -y install wget
 
@@ -26,12 +26,12 @@ RUN dnf -y install akmod-nvidia akmod-VirtualBox
 COPY akmods.sh /tmp/akmods.sh
 RUN /tmp/akmods.sh
 
-FROM ghcr.io/andersrh/my-ostree-os-base2:main-38 AS builder
+FROM ghcr.io/andersrh/my-ostree-os-base2:main-39 AS builder
 
 ARG IMAGE_NAME="${IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 
-COPY --from=ghcr.io/ublue-os/akmods-nvidia:38-535 /rpms /tmp/akmods-rpms
+COPY --from=ghcr.io/ublue-os/akmods-nvidia:39-535 /rpms /tmp/akmods-rpms
 
 RUN rpm-ostree install \
     /tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm
@@ -43,7 +43,7 @@ COPY install-nvidia.sh /tmp/install-nvidia.sh
 RUN cd /etc/yum.repos.d/ && wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-addons-fedora-$(rpm -E %fedora).repo
 
 # add bore-sysctl and uksmd-lts
-RUN rpm-ostree install bore-sysctl uksmd
+RUN rpm-ostree install bore-sysctl uksmd-rawhide
 
 # enable systemd services