Revert "build-devtoolbox: Work around broken SELinux in toolbox containers"

[bin.git] / build-devtoolbox

diff --git a/build-devtoolbox b/build-devtoolbox
index 047b8344b9c888f73328f47b1d753954389ac720..94b5e0a95ca278f846cb86db1ec0952d19bc3be3 100755 (executable)
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -27,17 +27,13 @@ sudo update-ca-trust
 # HACK: no rcm-tools for F31 yet
 sudo sed -i "s/\$releasever/30/" /etc/yum.repos.d/rcm-tools-fedora.repo
 
-# HACK: installing selinux-policy (through transitive builddep cockpit dep) breaks toolbox; https://bugzilla.redhat.com/show_bug.cgi?id=1768075
-sudo dnf install -y selinux-policy
-rpm -ql selinux-policy | sudo xargs rm -f || true
-
 sudo dnf builddep -y cockpit
 sudo dnf install -y make npm fontconfig git valgrind chromium \
     libvirt-daemon-kvm libvirt-client python3-libvirt \
     virt-viewer virt-install libappstream-glib \
     expect python3-pycodestyle python3-pyflakes \
     fedpkg rhpkg /usr/bin/oc /usr/bin/genisoimage \
-    man-pages socat wget genisoimage vim-enhanced \
+    man-pages socat wget genisoimage vim-X11 \
     ansible standard-test-roles rsync strace diffstat \
     pwgen glibc-langpack-en waiverdb-cli
 
@@ -45,6 +41,8 @@ sudo dnf debuginfo-install -y glib2 glibc libssh gnutls
 
 sudo dnf clean packages
 
+sudo pip install awscli
+
 # unbreak kerberos; https://github.com/debarshiray/toolbox/issues/235
 cat <<EOF | sudo tee /etc/krb5.conf.d/0_file_ccache
 [libdefaults]
@@ -54,4 +52,7 @@ EOF
 # set up waiverdb
 printf "[waiverdb]\nauth_method=Kerberos\nresultsdb_api_url=https://resultsdb-api.engineering.redhat.com/api/v2.0\napi_url=https://waiverdb.engineering.redhat.com/api/v1.0\nkrb_principal=HTTP/waiverdb.engineering.redhat.com@REDHAT.COM\n" | sudo tee /etc/waiverdb/client.conf
 printf "[libdefaults]\n    dns_canonicalize_hostname = false\n" | sudo tee /etc/krb5.conf.d/waiverdb-canonicalize-hostname
+
+# vim-X11 does not ship vim binary
+sudo ln -s vimx /usr/bin/vim
 '