From 7dd25123005d4e86b7da1f672eafd6993607c995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= <kristof.toth@avatao.com>
Date: Mon, 5 Mar 2018 16:17:56 +0100
Subject: [PATCH] Fix history monitoring stuff in Dockerfile (AVATAO baseimage
 bashrc)

---
 Dockerfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fd700c2..00edd03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,11 +62,15 @@ ENV PYTHONPATH="/usr/local/lib/"                                           \
     TFW_TERMINADO_DIR="/tmp/terminado_server"                              \
     TFW_FRONTEND_DIR="/srv/frontend"                                       \
     TFW_HISTFILE="/home/${AVATAO_USER}/.bash_history"                      \
-    PROMPT_COMMAND="history -a"                                            \
-    HISTFILESIZE=1000                                                      \
-    HISTSIZE=1000
+    PROMPT_COMMAND="history -a"
 
-RUN echo "shopt -s cmdhist && shopt -s histappend" >> .bashrc
+RUN echo "shopt -s cmdhist\n"            \
+         "shopt -s histappend\n"         \
+         "unset HISTCONTROL\n"           \
+         "export HISTFILESIZE=1000\n"    \
+         "export HISTSIZE=1000\n"        \
+         'PROMPT_COMMAND="history -a"\n' \
+    >> /home/${AVATAO_USER}/.bashrc
 
 COPY nginx/nginx.conf ${TFW_NGINX_CONF}
 COPY nginx/components/ ${TFW_NGINX_COMPONENTS}