X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-cockpit-toolbox;h=3b0ae8613b66a6b934eb429348bc89d9473cf228;hp=c13b76364e9731dd7fbd810e4c6ce8ffe7228de9;hb=HEAD;hpb=cfa73945fb7d66449a7fefa88d42ac3f6fb8450f diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox index c13b763..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 ' @@ -17,16 +17,16 @@ sudo hostname -F /etc/hostname sudo sed -i s/nodocs// /etc/dnf/dnf.conf 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 python3-pytest-asyncio libnotify \ + 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 \ - dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn \ + tmt flatpak-builder flatpak-spawn \ fedpkg centpkg # commands to forward to the host for cmd in podman toolbox nmcli eog evince; do - printf "flatpak-spawn --host $cmd \42\$@\42\n" | sudo tee /usr/local/bin/$cmd >/dev/null + 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 '