Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(ci): kvmfr module in common #1292

Merged
merged 1 commit into from
May 12, 2024
Merged

chore(ci): kvmfr module in common #1292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ ARG TARGET_BASE="${TARGET_BASE:-bluefin}"

# KMODs
ARG KMOD_SOURCE_COMMON="ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}"
ARG KMOD_SOURCE_EXTRA="ghcr.io/ublue-os/akmods-extra:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}"
FROM ${KMOD_SOURCE_COMMON} as akmod-common
FROM ${KMOD_SOURCE_EXTRA} as akmod-extra
FROM ${KMOD_SOURCE_COMMON} as akmods

## bluefin image section
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS base
Expand All @@ -34,7 +32,7 @@ COPY /system_files/shared/usr/etc/ublue-update/ublue-update.toml /tmp/ublue-upda
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/bin/atuin /usr/bin/atuin
COPY --from=ghcr.io/ublue-os/bluefin-cli /usr/share/bash-prexec /usr/share/bash-prexec
# COPY ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
COPY --from=akmod-common /rpms /tmp/akmods-rpms
COPY --from=akmods /rpms /tmp/akmods-rpms

# Build, cleanup, commit.
RUN rpm-ostree cliwrap install-to-root / && \
Expand Down Expand Up @@ -67,7 +65,7 @@ COPY system_files/dx /
COPY packages.json /tmp/packages.json

# Copy akmods-extra from ublue
COPY --from=akmod-extra /rpms /tmp/akmods-rpms
COPY --from=akmods /rpms /tmp/akmods-rpms

# Build, Clean-up, Commit
RUN bash -c ". /tmp/build/build-dx.sh" && \
Expand Down
Loading