build-sid-toolbox: Eliminate intermediate container image

[bin.git] / build-devtoolbox

diff --git a/build-devtoolbox b/build-devtoolbox
index 88d616de96f37c8c88723e2338ae4861dd63a68b..004c5373e1d3e3da40c5f273fc694eafdc74bacd 100755 (executable)
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,6 +14,7 @@ yes | toolbox create $RELEASE -c $NAME
 
 # install cockpit's build deps and other development tools
 toolbox run -c "$NAME" sh -exc '
+# https://bugzilla.redhat.com/show_bug.cgi?id=1785244
 if [ ! -e /etc/resolv.conf ]; then
     sudo ln -sfn /run/host/monitor/resolv.conf /etc/resolv.conf
 fi
@@ -33,21 +34,22 @@ sudo dnf install -y make npm fontconfig git valgrind chromium \
     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 \
-    ansible standard-test-roles rsync strace \
-    pwgen glibc-langpack-en waiverdb-cli
+    man-pages socat wget genisoimage vim-X11 \
+    ansible standard-test-roles rsync strace diffstat \
+    pwgen glibc-langpack-en tig twine dbus-daemon
 
 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]
     default_ccache_name = FILE:/tmp/krb5.ccache
 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
 '