mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-03-14 01:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'testing'

Browse Source
This commit is contained in:
Kyle Gospodnetich 2024-04-14 13:10:56 -07:00
commit 0ee2428b00
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build.yml vendored
View File

@ -30,6 +30,7 @@ on:
workflow_dispatch:
env:
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
KERNEL_VERSION: 6.8.4-202.fsync
concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
@ -85,7 +86,7 @@ jobs:
- name: Matrix Variables
run: |
echo "AKMODS_FLAVOR=fsync-lts" >> $GITHUB_ENV
echo "AKMODS_FLAVOR=fsync" >> $GITHUB_ENV
echo "BASE_IMAGE_NAME=${{ matrix.base_image_name }}" >> $GITHUB_ENV
if [[ "${{ matrix.base_image_flavor }}" == "framework" ]]; then

14
Containerfile
View File

@ -12,7 +12,7 @@ FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite
ARG IMAGE_NAME="${IMAGE_NAME:-bazzite}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync-lts}"
ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
@ -45,11 +45,11 @@ RUN wget https://raw.githubusercontent.com/ublue-os/COPR-command/main/copr -O /u
ostree container commit
# Install kernel-fsync
RUN wget https://copr.fedorainfracloud.org/coprs/sentry/kernel-ba/repo/fedora-$(rpm -E %fedora)/sentry-kernel-ba-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_sentry-kernel-ba.repo && \
RUN wget https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/repo/fedora-$(rpm -E %fedora)/sentry-kernel-fsync-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo && \
rpm-ostree cliwrap install-to-root / && \
rpm-ostree override replace \
--experimental \
--from repo=copr:copr.fedorainfracloud.org:sentry:kernel-ba \
--from repo=copr:copr.fedorainfracloud.org:sentry:kernel-fsync \
kernel \
kernel-core \
kernel-modules \
@ -216,6 +216,11 @@ RUN rpm-ostree override replace \
--from repo=updates \
libinput \
|| true && \
rpm-ostree override replace \
--experimental \
--from repo=updates \
libopenmpt \
|| true && \
rpm-ostree override remove \
glibc32 \
|| true && \
@ -790,7 +795,6 @@ RUN wget https://raw.githubusercontent.com/ublue-os/bazzite/main/scripts/image-i
systemctl disable vpower.service && \
systemctl disable jupiter-biosupdate.service && \
systemctl disable jupiter-controller-update.service && \
systemctl disable ryzenadj.service && \
systemctl disable batterylimit.service && \
rm -f /usr/etc/sddm.conf && \
rm -f /usr/etc/default/bazzite && \
@ -801,7 +805,7 @@ FROM bazzite as bazzite-nvidia
ARG IMAGE_NAME="${IMAGE_NAME:-bazzite-nvidia}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}"
ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync-lts}"
ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"