X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-cockpit-toolbox;h=3b0ae8613b66a6b934eb429348bc89d9473cf228;hp=7998e8fc93dbcc3001058d8753af0b1e5032579e;hb=HEAD;hpb=791a81a30e65e93bd6b10ec7ec983ec8fe79a727 diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox index 7998e8f..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,18 +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 tmt tmt-provision-virtual flatpak-builder flatpak-spawn + tmt flatpak-builder flatpak-spawn \ + fedpkg centpkg -# 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 +# 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 '