Add podman compose and terraform to nvidia build
All checks were successful
ci / workstation (push) Successful in 24m55s
ci / workstation-nvidia (push) Successful in 12s

This commit is contained in:
Jonathan Cremin 2025-05-21 11:01:52 +01:00
parent 002c44271b
commit 08aa6a795b
2 changed files with 70 additions and 60 deletions

View file

@ -48,6 +48,7 @@ RUN dnf remove -y \
mpv \ mpv \
ncdu \ ncdu \
pavucontrol \ pavucontrol \
podman-compose \
sysstat \ sysstat \
tailscale \ tailscale \
vdpauinfo \ vdpauinfo \
@ -61,7 +62,12 @@ RUN dnf remove -y \
# Setup watercooling # Setup watercooling
RUN dnf copr enable -y codifryed/CoolerControl && \ RUN dnf copr enable -y codifryed/CoolerControl && \
dnf install -y coolercontrol && \ dnf install -y coolercontrol && \
systemctl enable coolercontrold systemctl enable coolercontrold && \
dnf clean all
RUN dnf config-manager addrepo --from-repofile=https://rpm.releases.hashicorp.com/fedora/hashicorp.repo && \
dnf install -y terraform && \
dnf clean all
# Remove btop and nvtop shortcuts # Remove btop and nvtop shortcuts
RUN rm /usr/share/applications/btop.desktop /usr/share/applications/nvtop.desktop RUN rm /usr/share/applications/btop.desktop /usr/share/applications/nvtop.desktop

View file

@ -3,64 +3,68 @@ FROM ghcr.io/ublue-os/silverblue-main:42
COPY etc /etc COPY etc /etc
RUN dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm && \ RUN dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm && \
dnf install -y https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \ dnf install -y https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
dnf clean all dnf clean all
RUN dnf remove -y \ RUN dnf remove -y \
ptyxis \ ptyxis \
gnome-software \ gnome-software \
htop \ htop \
gnome-classic-session \ gnome-classic-session \
gnome-shell-extension-apps-menu \ gnome-shell-extension-apps-menu \
gnome-shell-extension-background-logo \ gnome-shell-extension-background-logo \
gnome-shell-extension-launch-new-instance \ gnome-shell-extension-launch-new-instance \
gnome-shell-extension-places-menu \ gnome-shell-extension-places-menu \
gnome-shell-extension-window-list \ gnome-shell-extension-window-list \
open-vm-tools \ open-vm-tools \
open-vm-tools-desktop \ open-vm-tools-desktop \
qemu-guest-agent \ qemu-guest-agent \
spice-vdagent \ spice-vdagent \
spice-webdavd \ spice-webdavd \
virtualbox-guest-additions && \ virtualbox-guest-additions && \
dnf swap -y ffmpeg-free ffmpeg --allowerasing && \ dnf swap -y ffmpeg-free ffmpeg --allowerasing && \
dnf swap -y libavcodec-free libavcodec-freeworld --allowerasing && \ dnf swap -y libavcodec-free libavcodec-freeworld --allowerasing && \
dnf remove -y pipewire-libs-extra && \ dnf remove -y pipewire-libs-extra && \
dnf group install -y multimedia --setopt="install_weak_deps=False" --exclude=PackageKit-gstreamer-plugin --allowerasing && \ dnf group install -y multimedia --setopt="install_weak_deps=False" --exclude=PackageKit-gstreamer-plugin --allowerasing && \
dnf copr enable -y alternateved/eza && \ dnf copr enable -y alternateved/eza && \
dnf copr enable -y pgdev/ghostty && \ dnf copr enable -y pgdev/ghostty && \
dnf install -y \ dnf install -y \
acpi \ acpi \
akmod-v4l2loopback \ akmod-v4l2loopback \
btop \ btop \
direnv \ direnv \
dmidecode \ dmidecode \
eza \ eza \
ffmpegthumbnailer \ ffmpegthumbnailer \
ghostty \ ghostty \
git \ git \
gnome-boxes \ gnome-boxes \
gstreamer1-vaapi \ gstreamer1-vaapi \
helm \ helm \
kubectl \ kubectl \
lm_sensors \ lm_sensors \
lshw \ lshw \
nmcli \ nmcli \
mpv \ mpv \
ncdu \ ncdu \
pavucontrol \ pavucontrol \
sysstat \ podman-compose \
tailscale \ sysstat \
vdpauinfo \ tailscale \
vulkan-tools \ vdpauinfo \
zsh \ vulkan-tools \
zsh-syntax-highlighting && \ zsh \
# Clean up zsh-syntax-highlighting && \
dnf clean all # Clean up
dnf clean all
RUN dnf config-manager addrepo --from-repofile=https://rpm.releases.hashicorp.com/fedora/hashicorp.repo && \
dnf install -y terraform && \
dnf clean all
# Remove btop and nvtop shortcuts # Remove btop and nvtop shortcuts
RUN rm /usr/share/applications/btop.desktop /usr/share/applications/nvtop.desktop RUN rm /usr/share/applications/btop.desktop /usr/share/applications/nvtop.desktop
# Don't install 1password, the browser integration breaks because 1Password uses /opt. # Don't install 1password, the browser integration breaks because 1Password uses /opt.
# I think this is polkit related. # I think this is polkit related.
# RUN mkdir -p /var/opt # RUN mkdir -p /var/opt
@ -70,10 +74,10 @@ RUN rm /usr/share/applications/btop.desktop /usr/share/applications/nvtop.deskto
RUN authselect enable-feature with-fingerprint RUN authselect enable-feature with-fingerprint
LABEL org.opencontainers.image.description="Built on ublue-os/silverblue-main, adding more batteries" \ LABEL org.opencontainers.image.description="Built on ublue-os/silverblue-main, adding more batteries" \
org.opencontainers.image.source="https://cremin.dev/jonathan/bootc" \ org.opencontainers.image.source="https://cremin.dev/jonathan/bootc" \
org.opencontainers.image.title="ublue-silverblue-main" \ org.opencontainers.image.title="ublue-silverblue-main" \
org.opencontainers.image.url="https://cremin.dev/jonathan/bootc" \ org.opencontainers.image.url="https://cremin.dev/jonathan/bootc" \
org.opencontainers.image.created="" \ org.opencontainers.image.created="" \
org.opencontainers.image.licenses="Unlicensed" \ org.opencontainers.image.licenses="Unlicensed" \
org.opencontainers.image.revision="" \ org.opencontainers.image.revision="" \
org.opencontainers.image.version="" org.opencontainers.image.version=""