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

upgrade to Fedora 41

Browse source
This commit is contained in:
Anders Rytter Hansen 2024-12-09 12:53:49 +01:00
commit 89f76135cb
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/os.yml vendored
View file

@ -92,7 +92,7 @@ jobs:
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}, ${{ steps.meta.outputs.tags }}-40, ${{ steps.meta.outputs.tags }}-40.${{ steps.date.outputs.date }}
tags: ${{ steps.meta.outputs.tags }}, ${{ steps.meta.outputs.tags }}-41, ${{ steps.meta.outputs.tags }}-41.${{ steps.date.outputs.date }}
# labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max

8
Dockerfile
View file

@ -1,4 +1,4 @@
FROM fedora:40 AS akmods-builder
FROM fedora:41 AS akmods-builder
# Get list of kernels from CachyOS LTO repo. If the list has been updated, then akmods will be rebuilt. If it hasn't been updated, then caching of the previous build will be used.
ADD "https://copr.fedorainfracloud.org/api_3/build/list?ownername=bieszczaders&projectname=kernel-cachyos-lto&packagename=kernel-cachyos-lto" /tmp/builds.txt
@ -22,7 +22,7 @@ RUN dnf -y install akmod-nvidia akmod-VirtualBox
COPY akmods.sh /tmp/akmods.sh
RUN /tmp/akmods.sh
FROM quay.io/fedora-ostree-desktops/kinoite:40 AS base
FROM quay.io/fedora-ostree-desktops/kinoite:41 AS base
ARG CACHEBUST=2
@ -134,7 +134,7 @@ RUN rpm-ostree install https://github.com/TheAssassin/AppImageLauncher/releases/
RUN rpm-ostree install gwenview
# add cachyos-settings, uksmd and scx-scheds-git
RUN rpm-ostree install uksmd scx-scheds-git libcap-ng-devel procps-ng-devel
RUN rpm-ostree install scx-scheds-git libcap-ng-devel procps-ng-devel
RUN rpm-ostree override remove zram-generator-defaults --install cachyos-settings
# Install TeamViewer
@ -148,8 +148,6 @@ RUN rpm-ostree install waydroid
RUN rpm-ostree install virt-manager libvirt-daemon-driver-lxc libvirt-daemon-lxc
# enable systemd services
RUN systemctl enable uksmd.service
RUN systemctl enable scx.service
# Copy config files