chore: replace rpm-ostree with dnf

rsturla · Nov 23, 2024 · 9c4eb7b · 9c4eb7b
1 parent 84b825c
commit 9c4eb7b
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 17 deletions.
diff --git a/lumina/Containerfile b/lumina/Containerfile
@@ -17,6 +17,4 @@ RUN chmod +x /tmp/scripts/*.sh /tmp/scripts/*.sh /tmp/scripts/_${BASE_IMAGE}/*.s
   /tmp/scripts/setup.sh --base ${BASE_IMAGE} && \
   /tmp/scripts/cleanup.sh --base ${BASE_IMAGE} \
   && \
-  rpm-ostree cleanup -m && \
-  rm -rf /tmp/* /var/* && \
-  ostree container commit
+  rm -rf /tmp/* /var/*
diff --git a/lumina/scripts/_base/003-ptyxis-terminal.sh b/lumina/scripts/_base/003-ptyxis-terminal.sh
@@ -7,5 +7,5 @@ FEDORA_VERSION=$VERSION_ID
 
 if [[ "$FEDORA_VERSION" == "40" ]]; then
   # Install the package
-  rpm-ostree install ptyxis
+  dnf install -y ptyxis
 fi
diff --git a/lumina/scripts/_base/005-virt-manager.sh b/lumina/scripts/_base/005-virt-manager.sh
@@ -2,7 +2,7 @@
 
 set -euox pipefail
 
-rpm-ostree install \
+dnf install -y \
   libvirt \
   virt-manager \
   edk2-ovmf

diff --git a/lumina/scripts/_base/006-docker.sh b/lumina/scripts/_base/006-docker.sh
@@ -12,7 +12,7 @@ gpgcheck=1
 gpgkey=https://download.docker.com/linux/fedora/gpg
 EOF
 
-rpm-ostree install \
+dnf install -y \
   docker-ce \
   docker-ce-cli \
   containerd.io \

diff --git a/lumina/scripts/_base/007-install-development-tools.sh b/lumina/scripts/_base/007-install-development-tools.sh
@@ -21,7 +21,7 @@ gpgkey=https://packages.microsoft.com/keys/microsoft.asc
 EOF
 
 # Install development tools
-rpm-ostree install \
+dnf install -y \
   code \
   gh \
   git-credential-oauth

diff --git a/lumina/scripts/_base/008-install-nordvpn.sh b/lumina/scripts/_base/008-install-nordvpn.sh
@@ -12,7 +12,7 @@ repo_gpgcheck=1
 gpgkey=https://repo.nordvpn.com/gpg/nordvpn_public.asc
 EOF
 
-rpm-ostree install nordvpn
+dnf install -y nordvpn
 systemctl enable nordvpnd
 
 rm -f /etc/yum.repos.d/nordvpn.repo
diff --git a/lumina/scripts/_base/009-install-google-chrome.sh b/lumina/scripts/_base/009-install-google-chrome.sh
@@ -39,7 +39,7 @@ curl --retry 3 --retry-delay 2 --retry-all-errors -sL \
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-google
 
 # Now let's install the packages.
-rpm-ostree install google-chrome-stable
+dnf install -y google-chrome-stable
 
 # Clean up the yum repo (updates are baked into new images)
 rm /etc/yum.repos.d/google-chrome.repo -f

diff --git a/lumina/scripts/_base/010-install-1password.sh b/lumina/scripts/_base/010-install-1password.sh
@@ -34,7 +34,7 @@ EOF
 #rpm --import https://downloads.1password.com/linux/keys/1password.asc
 
 # Now let's install the packages.
-rpm-ostree install 1password 1password-cli
+dnf install -y 1password 1password-cli
 
 # Clean up the yum repo (updates are baked into new images)
 rm /etc/yum.repos.d/1password.repo -f

diff --git a/lumina/scripts/_base/011-podman-tools.sh b/lumina/scripts/_base/011-podman-tools.sh
@@ -2,6 +2,6 @@
 
 set -euox pipefail
 
-rpm-ostree install \
+dnf install -y \
     crun-vm \
     podman-machine
diff --git a/lumina/scripts/_base/012-install-brew.sh b/lumina/scripts/_base/012-install-brew.sh
@@ -3,7 +3,7 @@
 set -euox pipefail
 
 # Install Brew dependencies
-rpm-ostree install procps-ng curl file git gcc
+dnf install -y procps-ng curl file git gcc
 
 # Convince the installer we are in CI
 touch /.dockerenv

diff --git a/lumina/scripts/_base/013-charm-mods.sh b/lumina/scripts/_base/013-charm-mods.sh
@@ -2,5 +2,5 @@
 
 set -euox pipefail
 
-rpm-ostree install \
+dnf install -y \
   $(curl https://api.github.com/repos/charmbracelet/mods/releases/latest | jq -r '.assets[] | select(.name| test(".*.x86_64.rpm$")).browser_download_url')
diff --git a/lumina/scripts/_base/013-twingate.sh b/lumina/scripts/_base/013-twingate.sh
@@ -11,6 +11,6 @@ enabled=1
 gpgcheck=0
 EOF
 
-rpm-ostree install twingate
+dnf install -y twingate
 
 rm /etc/yum.repos.d/twingate.repo
diff --git a/lumina/scripts/_silverblue/001-gnome-shell.sh b/lumina/scripts/_silverblue/001-gnome-shell.sh
@@ -7,7 +7,7 @@ FEDORA_VERSION=$VERSION_ID
 
 wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(rpm -E %fedora)/ublue-os-staging-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os_staging.repo
 
-rpm-ostree install \
+dnf install -y \
   gnome-shell-extension-appindicator \
   gnome-shell-extension-dash-to-dock \
   gnome-shell-extension-blur-my-shell \

diff --git a/lumina/scripts/_silverblue/002-remove-gnome-packages.sh b/lumina/scripts/_silverblue/002-remove-gnome-packages.sh
@@ -5,12 +5,12 @@ source /etc/os-release
 
 FEDORA_VERSION=$VERSION_ID
 
-rpm-ostree override remove \
+dnf remove -y \
   gnome-tour \
   gnome-extensions-app \
   gnome-system-monitor \
   yelp
 
 if [[ "$FEDORA_VERSION" == "40" ]]; then
-  rpm-ostree override remove gnome-terminal-nautilus
+  dnf remove -y gnome-terminal-nautilus
 fi