X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-cockpit-toolbox;h=3b0ae8613b66a6b934eb429348bc89d9473cf228;hp=55d87eb6e947b5a6625d187cd0d74ed292500721;hb=HEAD;hpb=18e95e0c178a3889a912724aa2a9e3b146756f6f

diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox
index 55d87eb..39844bd 100755
--- a/build-cockpit-toolbox
+++ b/build-cockpit-toolbox
@@ -4,8 +4,8 @@ NAME=${NAME:-cockpit}
 TAG=${TAG:-latest}
 
 toolbox rm --force $NAME || true
-podman pull quay.io/cockpit/tasks:${TAG}
-yes | toolbox create --image quay.io/cockpit/tasks:${TAG} -c $NAME
+podman pull ghcr.io/cockpit-project/tasks:${TAG}
+yes | toolbox create --image ghcr.io/cockpit-project/tasks:${TAG} -c $NAME
 
 # install some extra development and desktop tools
 toolbox run -c "$NAME" sh -exc '
@@ -16,42 +16,17 @@ sudo hostname -F /etc/hostname
 # enable manpages
 sudo sed -i s/nodocs// /etc/dnf/dnf.conf
 
-sudo dnf install -y ansible man-pages moreutils gh \
-    python3-boto python3-boto3 libnotify \
-    pandoc texlive-ec texlive-pdfjam texlive-beamer \
-    /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert \
-    kpcli \
+sudo dnf install -y ansible bash-completion man-db man-pages moreutils fd-find ripgrep gh git-delta neovim \
+    python3-boto python3-boto3 python3-openstacksdk libnotify \
+    simple-scan /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert pdfmerge \
+    cargo rustfmt clippy \
     calibre qt5-qtwayland \
-    chromium dbus-daemon flatpak-builder flatpak-spawn
-
-# 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.fc35.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
+    tmt flatpak-builder flatpak-spawn \
+    fedpkg centpkg
+
+# commands to forward to the host
+for cmd in podman toolbox nmcli eog evince; do
+    printf "#!/bin/sh\nexec flatpak-spawn --host $cmd \42\$@\42\n" | sudo tee /usr/local/bin/$cmd >/dev/null
+    sudo chmod a+x /usr/local/bin/$cmd
+done
 '