X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-cockpit-toolbox;h=07113caf3e5017cc30b61c69f086282ec9a5c1b9;hp=a3a553641526b69f780cd2fc63713064633a1281;hb=5c1cbc7fb8bc397e0de2da90fd63677d4d464f12;hpb=204c9a137e8c1844a87d74c70c5d1c5f64570f3e

diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox
index a3a5536..07113ca 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,17 @@ 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 \
     python3-boto python3-boto3 libnotify \
     pandoc texlive-ec texlive-pdfjam \
     /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert \
     kpcli \
     calibre qt5-qtwayland \
-    dbus-daemon tmt testcloud
-
-# 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
+    chromium dbus-daemon tmt tmt-provision-virtual flatpak-builder
 
 # debugging cockpit crashes
 sudo dnf debuginfo-install -y glib2 glibc libssh gnutls