From 3c53f5467e23c2cc417af2b7f7bca98c7be75bab Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Apr 09 2017 12:15:25 +0000
Subject: [dockerized-backend] compatibility updates for the latest backend


---

diff --git a/backend/docker/Dockerfile b/backend/docker/Dockerfile
index ce019c5..131fbd2 100644
--- a/backend/docker/Dockerfile
+++ b/backend/docker/Dockerfile
@@ -40,6 +40,7 @@ RUN dnf -y install ethtool
 RUN dnf -y install uwsgi
 RUN dnf -y install uwsgi-plugin-python
 RUN dnf -y install rng-tools # to get more entropy for generation of gpg keys
+RUN dnf -y install expect # for unbuffer package
 
 # needed to be able to ping
 RUN setcap cap_net_raw,cap_net_admin+p /usr/bin/ping
diff --git a/backend/docker/files/etc/copr/copr-be.conf b/backend/docker/files/etc/copr/copr-be.conf
index 3c11976..9a93ce5 100644
--- a/backend/docker/files/etc/copr/copr-be.conf
+++ b/backend/docker/files/etc/copr/copr-be.conf
@@ -104,5 +104,4 @@ timeout=3600
 # consecutive_failure_threshold=10
 
 [ssh]
-port=2222
-# identity_file=
+builder_config=/root/.ssh/builder_config
diff --git a/backend/docker/files/root/.bashrc b/backend/docker/files/root/.bashrc
index 1fa0faa..3970241 100644
--- a/backend/docker/files/root/.bashrc
+++ b/backend/docker/files/root/.bashrc
@@ -15,12 +15,6 @@ fi
 PS1='[\u@backend \W] \$ '
 GREP_OPTIONS='--color=auto'
 
-stty werase undef
-bind '"\C-w": unix-filename-rubout'
-bind '"\C-x": unix-filename-rubout'
-bind '"\C-k": history-search-backward'
-bind '"\C-j": history-search-forward'
-
 alias soba='source ~/.bashrc'
 
 alias suvim='sudo vim'
diff --git a/backend/docker/files/root/.ssh/builder_config b/backend/docker/files/root/.ssh/builder_config
new file mode 100644
index 0000000..56dd4b9
--- /dev/null
+++ b/backend/docker/files/root/.ssh/builder_config
@@ -0,0 +1,18 @@
+Host *
+# For dynamically started VMs.
+StrictHostKeyChecking no
+UserKnownHostsFile /dev/null
+
+# For non-default paths to identity file.
+IdentityFile ~/.ssh/id_rsa
+
+# Ensure remote command uses proper line buffering for live logs
+# (so called live logs).
+RequestTTY=force
+
+# Keep control sockets open, to speedup subsequent command runs.
+ControlPath=/home/copr/ssh_socket_%h_%p_%r
+ControlMaster=auto
+ControlPersist=900
+
+Port=2222