X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-cockpit-toolbox;h=7998e8fc93dbcc3001058d8753af0b1e5032579e;hp=3971153b441c18bd4829d8f2757ffdb2820969c5;hb=791a81a30e65e93bd6b10ec7ec983ec8fe79a727;hpb=7f975a8479b4065be204c9681df32645d12a96b4

diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox
index 3971153..7998e8f 100755
--- 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,18 +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 \
+    kpcli \
     calibre qt5-qtwayland \
-    dbus-daemon tmt testcloud
+    chromium dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn
 
-# qemu:///session support for testcloud: https://pagure.io/testcloud/pull-request/83#
-sudo dnf install -y https://download.copr.fedorainfracloud.org/results/frantisekz/testcloud-wip/fedora-33-x86_64/01968005-testcloud/python3-testcloud-0.4.0-4.fc33.noarch.rpm https://download.copr.fedorainfracloud.org/results/frantisekz/testcloud-wip/fedora-33-x86_64/01968005-testcloud/testcloud-0.4.0-4.fc33.noarch.rpm
+# 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)
 '