build-cockpit-toolbox: Support running podman

[bin.git] / build-cockpit-toolbox

diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox
index 07113caf3e5017cc30b61c69f086282ec9a5c1b9..7998e8fc93dbcc3001058d8753af0b1e5032579e 100755 (executable)
--- a/build-cockpit-toolbox
+++ b/build-cockpit-toolbox
@@ -16,20 +16,18 @@ sudo hostname -F /etc/hostname
 # enable manpages
 sudo sed -i s/nodocs// /etc/dnf/dnf.conf
 
-# hack for flatpak-builder
-sudo mkdir -p /usr/lib/rpm/macros.d
-echo "%_netsharedpath /dev:/media:/mnt:/proc:/sys:/tmp:/var/lib/flatpak:/var/lib/libvirt" | sudo tee /usr/lib/rpm/macros.d/macros.toolbox
-
-sudo dnf install -y ansible man-pages moreutils \
+sudo dnf install -y ansible man-pages moreutils gh \
     python3-boto python3-boto3 libnotify \
-    pandoc texlive-ec texlive-pdfjam \
+    pandoc texlive-ec texlive-pdfjam texlive-beamer \
     /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert \
     kpcli \
     calibre qt5-qtwayland \
-    chromium dbus-daemon tmt tmt-provision-virtual flatpak-builder
+    chromium dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn
+
+# run podman in toolbox
+printf "flatpak-spawn --host podman \42\$@\42\n" | sudo tee /usr/local/bin/podman >/dev/null
+sudo chmod a+x /usr/local/bin/podman
 
 # debugging cockpit crashes
 sudo dnf debuginfo-install -y glib2 glibc libssh gnutls
-
-type gh >/dev/null 2>&1 || sudo dnf install -y $(curl -s https://api.github.com/repos/cli/cli/releases/latest | grep -o https:.*_linux_amd64.rpm)
 '