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

diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox
index c49a0b8..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,20 +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 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 tmt tmt-provision-virtual flatpak-builder
-
-# debugging cockpit crashes
-sudo dnf debuginfo-install -y glib2 glibc libssh gnutls
+    tmt flatpak-builder flatpak-spawn \
+    fedpkg centpkg
 
-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)
+# 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
 '