X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-cockpit-toolbox;h=3b0ae8613b66a6b934eb429348bc89d9473cf228;hp=a3a553641526b69f780cd2fc63713064633a1281;hb=14151b87aafb3f821f2eb160695cb48597963af4;hpb=204c9a137e8c1844a87d74c70c5d1c5f64570f3e

diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox
index a3a5536..3b0ae86 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,21 +16,42 @@ sudo hostname -F /etc/hostname
 # enable manpages
 sudo sed -i s/nodocs// /etc/dnf/dnf.conf
 
-sudo dnf install -y ansible man-pages moreutils \
-    python3-boto python3-boto3 libnotify \
-    pandoc texlive-ec texlive-pdfjam \
+sudo dnf install -y ansible man-db man-pages moreutils fd-find ripgrep gh \
+    python3-boto python3-boto3 python3-openstacksdk libnotify \
+    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 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/02076914-testcloud/python3-testcloud-0.4.0-6.fc33.noarch.rpm https://download.copr.fedorainfracloud.org/results/frantisekz/testcloud-wip/fedora-33-x86_64/02076914-testcloud/testcloud-0.4.0-6.fc33.noarch.rpm
-# uses qemu:///session
-sudo dnf install -y https://download.copr.fedorainfracloud.org/results/frantisekz/testcloud-wip/fedora-33-x86_64/02076588-tmt/python3-tmt-1.3.1-2.fc33.noarch.rpm https://download.copr.fedorainfracloud.org/results/frantisekz/testcloud-wip/fedora-33-x86_64/02076588-tmt/tmt-1.3.1-2.fc33.noarch.rpm https://download.copr.fedorainfracloud.org/results/frantisekz/testcloud-wip/fedora-33-x86_64/02076588-tmt/tmt-provision-virtual-1.3.1-2.fc33.noarch.rpm
+# HACK: tmt-provision-virtual has way too heavy dependencies: https://bugzilla.redhat.com/show_bug.cgi?id=2093717
+cat <<EOF > /tmp/spec
+Name: dummy-deps
+Summary: dummy dependencies
+Version: 999
+Release: 1%{?dist}
+# https://bugzilla.redhat.com/show_bug.cgi?id=2093717
+Provides: python3-libguestfs
+Provides: libguestfs-tools-c
+# also for tmt-provision-virtual
+Provides: libvirt
+License: BSD
+
+%description
+Dummy dependencies to avoid bloat.
+
+%files
+EOF
+rpmbuild --define "_topdir /tmp/rpmbuild-dummy" -bb /tmp/spec
+sudo rpm -i --verbose /tmp/rpmbuild-dummy/RPMS/x86_64/dummy-deps-999-1.fc*.x86_64.rpm
+rm -rf /tmp/rpmbuild-dummy /tmp/spec
+
+sudo dnf install -y --setopt=install_weak_deps=False tmt tmt-provision-virtual
+
+# 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)
 '