Skip to content

Commit

Permalink
Merge pull request #7 from tulilirockz/make-images-work
Browse files Browse the repository at this point in the history
fix: make the images work
  • Loading branch information
korewaChino authored Nov 25, 2024
2 parents 7371371 + 7f530b2 commit c8843a2
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 21 deletions.
2 changes: 1 addition & 1 deletion base/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN for pkg in kernel kernel-core kernel-modules kernel-modules-core ; do rpm --
# Also install some extra packages :3
RUN dnf install -y kernel kernel-core kernel-modules{,-core,-extra} linux-firmware fwupd fwupd-efi @ultramarine-product-common

# (why isnt this here?)
# Workaround to make dracut work just fine
RUN rm -rf /root

# Regenerate initramfs for new kernel
Expand Down
13 changes: 9 additions & 4 deletions flagship/Containerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM ghcr.io/ultramarine-linux/base-bootc:latest

RUN rm -rf /root # workaround
RUN dnf install \
-x PackageKit \
-x PackageKit-command-not-found \
-x grubby \
-x sdubby \
-x gnome-software-fedora-langpacks \
-x budgie-desktop-defaults \
--allowerasing -y \
@ultramarine-flagship-product-environment

RUN dnf install -x PackageKit -x PackageKit-command-not-found -x grubby -x sdubby -x gnome-software-fedora-langpacks --allowerasing -y @ultramarine-flagship-product-environment

RUN dnf clean all
13 changes: 9 additions & 4 deletions gnome/Containerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM ghcr.io/ultramarine-linux/base-bootc:latest

RUN rm -rf /root # workaround
RUN dnf install \
-x PackageKit \
-x PackageKit-command-not-found \
-x grubby \
-x sdubby \
-x gnome-software-fedora-langpacks \
-x gnome-software-rpm-ostree \
--allowerasing -y \
@ultramarine-gnome-product-environment

RUN dnf install -x PackageKit -x PackageKit-command-not-found -x grubby -x sdubby -x gnome-software-fedora-langpacks --allowerasing -y @ultramarine-gnome-product-environment

RUN dnf clean all
13 changes: 8 additions & 5 deletions kde/Containerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
FROM ghcr.io/ultramarine-linux/base-bootc:latest

RUN rm -rf /root # workaround

RUN dnf install -x PackageKit -x PackageKit-command-not-found -x grubby -x sdubby -x gnome-software-fedora-langpacks --allowerasing -y @ultramarine-plasma-product-environment

RUN dnf clean all
RUN dnf install \
-x PackageKit \
-x PackageKit-command-not-found \
-x grubby \
-x sdubby \
-x gnome-software-fedora-langpacks \
--allowerasing -y \
@ultramarine-plasma-product-environment
16 changes: 9 additions & 7 deletions xfce/Containerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
FROM ghcr.io/ultramarine-linux/base-bootc:latest

RUN rm -rf /root # workaround

RUN dnf4 remove -y desktop-backgrounds-compat

RUN dnf4 install -x PackageKit -x PackageKit-command-not-found -x grubby -x sdubby -x gnome-software-fedora-langpacks --allowerasing -y @ultramarine-xfce-product-environment

RUN dnf4 clean all
RUN dnf install \
-x PackageKit \
-x PackageKit-command-not-found \
-x grubby \
-x sdubby \
-x gnome-software-fedora-langpacks \
-x desktop-backgrounds-compat \
--allowerasing -y \
@ultramarine-xfce-product-environment

0 comments on commit c8843a2

Please sign in to comment.