build-cockpit-toolbox: Support running podman

[bin.git] / build-cockpit-toolbox

diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox
index 5b8990c1de13f0653190d3b8a5d41d79b6cd2e01..7998e8fc93dbcc3001058d8753af0b1e5032579e 100755 (executable)
--- a/build-cockpit-toolbox
+++ b/build-cockpit-toolbox
@@ -1,10 +1,11 @@
 #!/bin/sh
 set -eux
-NAME=cockpit
+NAME=${NAME:-cockpit}
+TAG=${TAG:-latest}
 
 toolbox rm --force $NAME || true
-podman pull quay.io/cockpit/tasks
-yes | toolbox create --image quay.io/cockpit/tasks -c $NAME
+podman pull quay.io/cockpit/tasks:${TAG}
+yes | toolbox create --image quay.io/cockpit/tasks:${TAG} -c $NAME
 
 # install some extra development and desktop tools
 toolbox run -c "$NAME" sh -exc '
@@ -15,14 +16,18 @@ sudo hostname -F /etc/hostname
 # enable manpages
 sudo sed -i s/nodocs// /etc/dnf/dnf.conf
 
-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 \
-    calibre qt5-qtwayland
+    kpcli \
+    calibre qt5-qtwayland \
+    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)
 '