anders/my-ostree-OS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

upgrade to Fedora 39

Browse source
This commit is contained in:
Anders Rytter Hansen 2024-01-02 00:08:54 +01:00
commit 6984a9e7ff
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel-akmods.Dockerfile
View file

@ -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