Skip to content
This repository has been archived by the owner on Feb 19, 2024. It is now read-only.

chore: rebrand #9

Merged
merged 2 commits into from
Oct 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
base_name: [bluefin, bluefin-dx]
base_name: [kfin, kfin-dx]
major_version: [38, 39]
include:
- major_version: 38
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
labels: |
org.opencontainers.image.title=${{ env.IMAGE_NAME }}
org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }}
org.opencontainers.image.description=An interpretation of the Ubuntu spirit built on Fedora technology
org.opencontainers.image.description=An interpretation of the Ubuntu spirit built on Fedora technology
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/bluefin/bluefin/README.md
io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4

Expand Down
10 changes: 5 additions & 5 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}"
ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}"
ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
ARG TARGET_BASE="${TARGET_BASE:-bluefin}"
ARG TARGET_BASE="${TARGET_BASE:-kfin}"

## bluefin image section
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bluefin
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS kfin

ARG IMAGE_NAME="${IMAGE_NAME}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR}"
Expand Down Expand Up @@ -78,14 +78,14 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-$(rp
rm -f /usr/share/applications/nvtop.desktop && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
sed -i '/^PRETTY_NAME/s/Silverblue/Bluefin/' /usr/lib/os-release && \
sed -i '/^PRETTY_NAME/s/Kinoite/Kfin/' /usr/lib/os-release && \
rm -rf /tmp/* /var/* && \
ostree container commit && \
mkdir -p /var/tmp && \
chmod -R 1777 /var/tmp

## bluefin-dx developer edition image section
FROM bluefin AS bluefin-dx
## kfin-dx developer edition image section
FROM kfin AS kfin-dx

ARG IMAGE_NAME="${IMAGE_NAME}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR}"
Expand Down
13 changes: 6 additions & 7 deletions boot_menu.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
ublue_variants:
- label: ublue-os/bluefin
- label: ublue-os/kfin
ks: /kickstart/ublue-os.ks
flavors:
- label: bluefin
info: Bluefin
- label: ublue-os/bluefin-nvidia
- label: kfin
info: Kfin
- label: ublue-os/kfin-nvidia
ks: /kickstart/ublue-os-nvidia.ks
subvariants:
- label: latest driver
- label: 470xx driver
suffix: -470
flavors:
- label: bluefin-nvidia
info: Bluefin

- label: kfin-nvidia
info: Kfin