From b9986c03762b1182b15e20be4b8e86ba0fc76676 Mon Sep 17 00:00:00 2001 From: ManInDark <61268856+ManInDark@users.noreply.github.com> Date: Tue, 6 Jan 2026 15:28:30 +0100 Subject: [PATCH] FIX: seperated build steps --- Containerfile | 18 ++++++-- build_files/{nvidia.sh => 00_nvidia.sh} | 0 build_files/01_pre_desktop.sh | 13 ++++++ build_files/02_gnome.sh | 24 ++++++++++ build_files/03_post_desktop.sh | 45 +++++++++++++++++++ build_files/{initramfs.sh => 04_initramfs.sh} | 0 build_files/build.sh | 32 ------------- 7 files changed, 97 insertions(+), 35 deletions(-) rename build_files/{nvidia.sh => 00_nvidia.sh} (100%) create mode 100755 build_files/01_pre_desktop.sh create mode 100755 build_files/02_gnome.sh create mode 100755 build_files/03_post_desktop.sh rename build_files/{initramfs.sh => 04_initramfs.sh} (100%) delete mode 100755 build_files/build.sh diff --git a/Containerfile b/Containerfile index 24f3d20..525847f 100644 --- a/Containerfile +++ b/Containerfile @@ -16,18 +16,30 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=bind,from=akmods,src=/rpms/ublue-os,dst=/tmp/akmods-rpms \ --mount=type=bind,from=akmods,src=/kernel-rpms,dst=/tmp/kernel-rpms \ --mount=type=bind,from=akmods_nvidia,src=/rpms,dst=/tmp/akmods-nv-rpms \ - /ctx/nvidia.sh + /ctx/00_nvidia.sh RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=cache,dst=/var/cache \ --mount=type=cache,dst=/var/log \ --mount=type=tmpfs,dst=/tmp \ - /ctx/build.sh + /ctx/01_pre_desktop.sh RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ --mount=type=cache,dst=/var/cache \ --mount=type=cache,dst=/var/log \ --mount=type=tmpfs,dst=/tmp \ - /ctx/initramfs.sh + /ctx/02_gnome.sh + +RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ + --mount=type=cache,dst=/var/cache \ + --mount=type=cache,dst=/var/log \ + --mount=type=tmpfs,dst=/tmp \ + /ctx/03_post_desktop.sh + +RUN --mount=type=bind,from=ctx,source=/,target=/ctx \ + --mount=type=cache,dst=/var/cache \ + --mount=type=cache,dst=/var/log \ + --mount=type=tmpfs,dst=/tmp \ + /ctx/04_initramfs.sh RUN bootc container lint diff --git a/build_files/nvidia.sh b/build_files/00_nvidia.sh similarity index 100% rename from build_files/nvidia.sh rename to build_files/00_nvidia.sh diff --git a/build_files/01_pre_desktop.sh b/build_files/01_pre_desktop.sh new file mode 100755 index 0000000..d7ecad5 --- /dev/null +++ b/build_files/01_pre_desktop.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -ouex pipefail + +cp /ctx/bootc-fetch-apply-updates.service /usr/lib/systemd/system/bootc-fetch-apply-updates.service +cp /ctx/os-release /usr/lib/os-release + +echo "LANG=de_DE.UTF-8" >> /etc/default/locale +ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime +ln -s /usr/bin/xdg-open /usr/bin/open + +dnf5 update -y --setopt=install_weak_deps=False +dnf5 install -y man-pages man-db glibc-langpack-en glibc-langpack-de default-fonts-cjk plymouth git \ No newline at end of file diff --git a/build_files/02_gnome.sh b/build_files/02_gnome.sh new file mode 100755 index 0000000..03cd7a0 --- /dev/null +++ b/build_files/02_gnome.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +set -ouex pipefail + +dnf5 install -y --setopt=exclude=gnome-tour,malcontent-control \ + gnome-shell \ + gnome-keyring \ + gnome-keyring-pam \ + gnome-terminal \ + gnome-bluetooth \ + gnome-calculator \ + gnome-disk-utility \ + gnome-extensions-app \ + gnome-browser-connector \ + gnome-backgrounds \ + gnome-shell-extension-appindicator +dnf5 install -y \ + totem \ + nautilus \ + seahorse \ + evolution \ + gstreamer1-plugin-libav + +git clone https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator.git /usr/share/gnome-shell/extensions/clipboard-indicator@tudmotu.com \ No newline at end of file diff --git a/build_files/03_post_desktop.sh b/build_files/03_post_desktop.sh new file mode 100755 index 0000000..03facae --- /dev/null +++ b/build_files/03_post_desktop.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +set -ouex pipefail + +dnf5 install -y \ + fzf \ + vlc \ + curl \ + btop \ + tmux \ + make \ + xsel \ + 7zip \ + nvtop \ + direnv \ + sqlite \ + flatpak \ + chromium \ + pciutils \ + tailscale \ + podman-compose \ + netcat tor torbrowser-launcher \ + ansible-core ansible-collection-community-general \ + pandoc-common pandoc-pdf texlive-collection-langgerman \ + hugo + +flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + +systemctl enable tailscaled.service +systemctl disable sshd.service + +# Install VSCode: https://packages.microsoft.com/yumrepos/vscode/ +curl -fsSLo /etc/yum.repos.d/vscode.repo https://packages.microsoft.com/yumrepos/vscode/config.repo +rpm-ostree install code +rm /etc/yum.repos.d/vscode.repo + +dnf5 install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ + https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm +dnf5 install -y --allowerasing ffmpeg x265-libs + +# Install Veracrypt: https://veracrypt.io/en/Downloads.html +dnf5 install -y https://launchpad.net/veracrypt/trunk/1.26.24/+download/veracrypt-1.26.24-Fedora-40-x86_64.rpm + +dnf5 remove -y rpmfusion-free-release rpmfusion-nonfree-release +dnf5 clean all diff --git a/build_files/initramfs.sh b/build_files/04_initramfs.sh similarity index 100% rename from build_files/initramfs.sh rename to build_files/04_initramfs.sh diff --git a/build_files/build.sh b/build_files/build.sh deleted file mode 100755 index 3ea3e5b..0000000 --- a/build_files/build.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -set -ouex pipefail -cp /ctx/bootc-fetch-apply-updates.service /usr/lib/systemd/system/bootc-fetch-apply-updates.service -cp /ctx/os-release /usr/lib/os-release - -dnf5 update -y --setopt=install_weak_deps=False -dnf5 install -y man-pages man-db glibc-langpack-en glibc-langpack-de default-fonts-cjk plymouth -dnf5 install -y --setopt=exclude=gnome-tour,malcontent-control gnome-shell gnome-keyring gnome-keyring-pam gnome-bluetooth gnome-terminal nautilus seahorse evolution totem gstreamer1-plugin-libav gnome-extensions-app gnome-browser-connector gnome-shell-extension-appindicator -dnf5 install -y gnome-calculator gnome-disk-utility gnome-backgrounds -dnf5 install -y curl git btop nvtop tmux flatpak pciutils tailscale make fzf direnv xsel chromium 7zip pandoc-common pandoc-pdf texlive-collection-langgerman ansible-core ansible-collection-community-general vlc sqlite netcat tor torbrowser-launcher podman-compose hugo -git clone https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator.git /usr/share/gnome-shell/extensions/clipboard-indicator@tudmotu.com -flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo -echo "LANG=de_DE.UTF-8" >> /etc/default/locale -ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime -ln -s /usr/bin/xdg-open /usr/bin/open -systemctl enable tailscaled.service -systemctl disable sshd.service -# Install VSCode: https://packages.microsoft.com/yumrepos/vscode/ -curl -fsSLo /etc/yum.repos.d/vscode.repo https://packages.microsoft.com/yumrepos/vscode/config.repo -rpm-ostree install code -rm /etc/yum.repos.d/vscode.repo - -dnf5 install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ - https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm -dnf5 install -y --allowerasing ffmpeg x265-libs - -# Install Veracrypt: https://veracrypt.io/en/Downloads.html -dnf5 install -y https://launchpad.net/veracrypt/trunk/1.26.24/+download/veracrypt-1.26.24-Fedora-40-x86_64.rpm - -dnf5 remove -y rpmfusion-free-release rpmfusion-nonfree-release -dnf5 clean all