diff --git a/Containerfile b/Containerfile index 7e1b124072..f588131f58 100644 --- a/Containerfile +++ b/Containerfile @@ -42,11 +42,6 @@ COPY modules /tmp/modules/ # It is copied from the official container image since it's not available as an RPM. COPY --from=docker.io/mikefarah/yq /usr/bin/yq /usr/bin/yq -COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-signing.noarch.rpm /tmp/ -COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-update-services.noarch.rpm /tmp/ -COPY --from=ghcr.io/ublue-os/config:latest /rpms/ublue-os-udev-rules.noarch.rpm /tmp/ - # Run the build script, then clean up temp files and finalize container build. -RUN rpm -ivh /tmp/ublue-os-signing.noarch.rpm && rpm -ivh /tmp/ublue-os-update-services.noarch.rpm \ - && chmod +x /tmp/build.sh && /tmp/build.sh \ +RUN chmod +x /tmp/build.sh && /tmp/build.sh \ && rm -rf /tmp/* /var/* && rpm-ostree cleanup -m && ostree container commit diff --git a/config/recipe-kinoite-light-bore-eevdf.yml b/config/recipe-kinoite-light-bore-eevdf.yml index 8d93f72d40..e3d6940980 100644 --- a/config/recipe-kinoite-light-bore-eevdf.yml +++ b/config/recipe-kinoite-light-bore-eevdf.yml @@ -4,8 +4,8 @@ name: ublue-kinoite-light-bore-eevdf description: Ublue kinoite minimal with cachyos bore eevdf kernel # the base image to build on top of (FROM) and the version tag to use -base-image: quay.io/fedora-ostree-desktops/kinoite -image-version: 38 # latest is also supported if you want new updates ASAP +base-image: ghcr.io/vietchinh/kinoite-cachykernel-main +image-version: 39 # latest is also supported if you want new updates ASAP # list of modules, executed in order # you can include multiple instances of the same module @@ -13,25 +13,6 @@ modules: - from-file: recipe-kinoite-light.yml - - type: rpm-ostree - repos: - # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo - - https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos/repo/fedora-%OS_VERSION%/bieszczaders-kernel-cachyos-fedora-%OS_VERSION%.repo - - https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/repo/fedora-%OS_VERSION%/bieszczaders-kernel-cachyos-addons-fedora-%OS_VERSION%.repo - install: - # - micro - # - starship - - kernel-cachyos-rt - - libcap-ng-devel - - procps-ng-devel - - uksmd - remove: - - kernel - - kernel-core - - kernel-modules - - kernel-modules-core - - kernel-modules-extra - - type: systemd system: enabled: diff --git a/config/recipe-kinoite-light-libvirt-bore-eevdf.yml b/config/recipe-kinoite-light-libvirt-bore-eevdf.yml index fa5c7b9601..cc3b402695 100644 --- a/config/recipe-kinoite-light-libvirt-bore-eevdf.yml +++ b/config/recipe-kinoite-light-libvirt-bore-eevdf.yml @@ -4,8 +4,8 @@ name: ublue-kinoite-with-libvirt-bore-eevdf description: Ublue kinoite with libvirt qemu kvm virtualization # the base image to build on top of (FROM) and the version tag to use -base-image: quay.io/fedora-ostree-desktops/kinoite -image-version: 38 # latest is also supported if you want new updates ASAP +base-image: ghcr.io/vietchinh/kinoite-cachykernel-main +image-version: 39 # latest is also supported if you want new updates ASAP # list of modules, executed in order # you can include multiple instances of the same module @@ -13,22 +13,6 @@ modules: - from-file: recipe-kinoite-light-libvirt.yml - - type: rpm-ostree - repos: - - https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos/repo/fedora-%OS_VERSION%/bieszczaders-kernel-cachyos-fedora-%OS_VERSION%.repo - - https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/repo/fedora-%OS_VERSION%/bieszczaders-kernel-cachyos-addons-fedora-%OS_VERSION%.repo - install: - - kernel-cachyos-rt - - libcap-ng-devel - - procps-ng-devel - - uksmd - remove: - - kernel - - kernel-core - - kernel-modules - - kernel-modules-core - - kernel-modules-extra - - type: systemd system: enabled: diff --git a/config/recipe-kinoite-light-libvirt.yml b/config/recipe-kinoite-light-libvirt.yml index bc19704304..ddb28ceebe 100644 --- a/config/recipe-kinoite-light-libvirt.yml +++ b/config/recipe-kinoite-light-libvirt.yml @@ -4,8 +4,8 @@ name: ublue-kinoite-with-libvirt description: Ublue kinoite with libvirt qemu kvm virtualization # the base image to build on top of (FROM) and the version tag to use -base-image: quay.io/fedora-ostree-desktops/kinoite -image-version: 38 # latest is also supported if you want new updates ASAP +base-image: ghcr.io/vietchinh/kinoite-main +image-version: 39 # latest is also supported if you want new updates ASAP # list of modules, executed in order # you can include multiple instances of the same module diff --git a/config/recipe-kinoite-light.yml b/config/recipe-kinoite-light.yml index a1049f2087..58f6bc63d5 100644 --- a/config/recipe-kinoite-light.yml +++ b/config/recipe-kinoite-light.yml @@ -4,8 +4,8 @@ name: ublue-kinoite-light description: Ublue kinoite minimal # the base image to build on top of (FROM) and the version tag to use -base-image: quay.io/fedora-ostree-desktops/kinoite -image-version: 38 # latest is also supported if you want new updates ASAP +base-image: ghcr.io/vietchinh/kinoite-main +image-version: 39 # latest is also supported if you want new updates ASAP # list of modules, executed in order # you can include multiple instances of the same module @@ -22,30 +22,6 @@ modules: # - Celluloid: io.github.celluloid_player.Celluloid # - Krita: org.kde.krita - - type: rpm-ostree - remove: - - firefox # default firefox removed in favor of flatpak - - firefox-langpacks # langpacks needs to also be removed to prevent dependency problems - - kf5-akonadi-server-mysql - - kf5-akonadi-server - - kmousetool - - krfb-libs - - krfb - - kmag - - mariadb-backup - - mariadb-cracklib-password-check - - mariadb-common - - mariadb-server-utils - - mariadb-server - - mariadb-errmsg - - mariadb-gssapi-server - - mariadb - - filelight - - mariadb-connector-c - - mariadb-connector-c-config - - perl-DBD-MariaDB - - qt5-qtbase-mysql - - type: systemd user: enabled: @@ -56,5 +32,3 @@ modules: scripts: # this sets up the proper policy & signing files for signed images to work - signing.sh - - kinoite.sh - - post-install.sh diff --git a/config/scripts/kinoite.sh b/config/scripts/kinoite.sh index fba9af3880..17815f9090 100644 --- a/config/scripts/kinoite.sh +++ b/config/scripts/kinoite.sh @@ -7,6 +7,3 @@ set -oue pipefail # Your code goes here. rpm -ivh /tmp/ublue-os-udev-rules.noarch.rpm - -wget https://raw.githubusercontent.com/ublue-os/main/main/post-install.sh -P /tmp/config/scripts -chmod +x /tmp/config/scripts/post-install.sh \ No newline at end of file